4 files changed, 401 insertions, 427 deletions

diff --git a/www/mybb/Makefile b/www/mybb/Makefile
index 232605c800db..5564877345e8 100644
--- a/www/mybb/Makefile
+++ b/www/mybb/Makefile
@@ -2,15 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	mybb
-PORTVERSION=	1.6.9
-PORTREVISION=	1
+PORTVERSION=	1.8.6
 CATEGORIES=	www
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	jochen@jochen-neumeister.de
 COMMENT=	PHP-based bulletin board / discussion forum system
 
 USE_GITHUB=	yes
-GH_TAGNAME=	${PORTNAME}_1609
+GH_TAGNAME=	${PORTNAME}_1806
 
 USES=		cpe
 NO_BUILD=	yes
diff --git a/www/mybb/distinfo b/www/mybb/distinfo
index 87d1d3c781f3..100de0ef8057 100644
--- a/www/mybb/distinfo
+++ b/www/mybb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mybb-mybb-1.6.9-mybb_1609_GH0.tar.gz) = c69213ac94ce737df23974ce33ff741f36b90da6427eec857b5888eb2feb9786
-SIZE (mybb-mybb-1.6.9-mybb_1609_GH0.tar.gz) = 1532351
+SHA256 (mybb-mybb-1.8.6-mybb_1806_GH0.tar.gz) = 85f3123f9bb289679763925c175f59b312225415aa5d50dfd275dde08952d860
+SIZE (mybb-mybb-1.8.6-mybb_1806_GH0.tar.gz) = 1831988
diff --git a/www/mybb/pkg-descr b/www/mybb/pkg-descr
index 6c3c65b891f6..905096cdf1df 100644
--- a/www/mybb/pkg-descr
+++ b/www/mybb/pkg-descr
@@ -6,4 +6,4 @@ the interested to read. You can also read more about the MyBB team and why
 they develop MyBB in their spare time. We also like to highlight the most
 active and contributing fansites of the MyBB community.
 
-WWW:	http://mybboard.net/
+WWW: http://mybboard.net/
diff --git a/www/mybb/pkg-plist b/www/mybb/pkg-plist
index b3fd1d178750..fa7d8f919b7a 100644
--- a/www/mybb/pkg-plist
+++ b/www/mybb/pkg-plist
@@ -1,3 +1,7 @@
+@owner www
+@group www
+%%WWWDIR%%/CONTRIBUTING.md
+%%WWWDIR%%/announcements.php
 %%WWWDIR%%/admin/backups/index.html
 %%WWWDIR%%/admin/inc/class_form.php
 %%WWWDIR%%/admin/inc/class_page.php
@@ -8,39 +12,77 @@
 %%WWWDIR%%/admin/inc/index.html
 %%WWWDIR%%/admin/index.php
 %%WWWDIR%%/admin/jscripts/admincp.js
-%%WWWDIR%%/admin/jscripts/codepress/codepress.css
-%%WWWDIR%%/admin/jscripts/codepress/codepress.html
-%%WWWDIR%%/admin/jscripts/codepress/codepress.js
-%%WWWDIR%%/admin/jscripts/codepress/engines/gecko.js
-%%WWWDIR%%/admin/jscripts/codepress/engines/khtml.js
-%%WWWDIR%%/admin/jscripts/codepress/engines/msie.js
-%%WWWDIR%%/admin/jscripts/codepress/engines/older.js
-%%WWWDIR%%/admin/jscripts/codepress/engines/opera.js
-%%WWWDIR%%/admin/jscripts/codepress/images/line-numbers.png
-%%WWWDIR%%/admin/jscripts/codepress/languages/autoit.css
-%%WWWDIR%%/admin/jscripts/codepress/languages/autoit.js
-%%WWWDIR%%/admin/jscripts/codepress/languages/codepress-mybb.css
-%%WWWDIR%%/admin/jscripts/codepress/languages/css.css
-%%WWWDIR%%/admin/jscripts/codepress/languages/css.js
-%%WWWDIR%%/admin/jscripts/codepress/languages/generic.css
-%%WWWDIR%%/admin/jscripts/codepress/languages/generic.js
-%%WWWDIR%%/admin/jscripts/codepress/languages/html.css
-%%WWWDIR%%/admin/jscripts/codepress/languages/html.js
-%%WWWDIR%%/admin/jscripts/codepress/languages/javascript.css
-%%WWWDIR%%/admin/jscripts/codepress/languages/javascript.js
-%%WWWDIR%%/admin/jscripts/codepress/languages/mybb.css
-%%WWWDIR%%/admin/jscripts/codepress/languages/mybb.js
-%%WWWDIR%%/admin/jscripts/codepress/languages/php.css
-%%WWWDIR%%/admin/jscripts/codepress/languages/php.js
-%%WWWDIR%%/admin/jscripts/codepress/languages/text.css
-%%WWWDIR%%/admin/jscripts/codepress/languages/text.js
-%%WWWDIR%%/admin/jscripts/codepress/license.txt
-%%WWWDIR%%/admin/jscripts/imodal.js
+%%WWWDIR%%/admin/jscripts/codemirror/LICENSE
+%%WWWDIR%%/admin/jscripts/codemirror/addon/dialog/dialog-mybb.css
+%%WWWDIR%%/admin/jscripts/codemirror/addon/dialog/dialog.css
+%%WWWDIR%%/admin/jscripts/codemirror/addon/dialog/dialog.js
+%%WWWDIR%%/admin/jscripts/codemirror/addon/dialog/index.html
+%%WWWDIR%%/admin/jscripts/codemirror/addon/fold/brace-fold.js
+%%WWWDIR%%/admin/jscripts/codemirror/addon/fold/comment-fold.js
+%%WWWDIR%%/admin/jscripts/codemirror/addon/fold/foldcode.js
+%%WWWDIR%%/admin/jscripts/codemirror/addon/fold/foldgutter.css
+%%WWWDIR%%/admin/jscripts/codemirror/addon/fold/foldgutter.js
+%%WWWDIR%%/admin/jscripts/codemirror/addon/fold/indent-fold.js
+%%WWWDIR%%/admin/jscripts/codemirror/addon/fold/index.html
+%%WWWDIR%%/admin/jscripts/codemirror/addon/fold/markdown-fold.js
+%%WWWDIR%%/admin/jscripts/codemirror/addon/fold/xml-fold.js
+%%WWWDIR%%/admin/jscripts/codemirror/addon/index.html
+%%WWWDIR%%/admin/jscripts/codemirror/addon/search/index.html
+%%WWWDIR%%/admin/jscripts/codemirror/addon/search/match-highlighter.js
+%%WWWDIR%%/admin/jscripts/codemirror/addon/search/matchesonscrollbar.css
+%%WWWDIR%%/admin/jscripts/codemirror/addon/search/matchesonscrollbar.js
+%%WWWDIR%%/admin/jscripts/codemirror/addon/search/search.js
+%%WWWDIR%%/admin/jscripts/codemirror/addon/search/searchcursor.js
+%%WWWDIR%%/admin/jscripts/codemirror/index.html
+%%WWWDIR%%/admin/jscripts/codemirror/lib/codemirror.css
+%%WWWDIR%%/admin/jscripts/codemirror/lib/codemirror.js
+%%WWWDIR%%/admin/jscripts/codemirror/lib/index.html
+%%WWWDIR%%/admin/jscripts/codemirror/mode/css/css.js
+%%WWWDIR%%/admin/jscripts/codemirror/mode/css/index.html
+%%WWWDIR%%/admin/jscripts/codemirror/mode/css/less.html
+%%WWWDIR%%/admin/jscripts/codemirror/mode/css/less_test.js
+%%WWWDIR%%/admin/jscripts/codemirror/mode/css/scss.html
+%%WWWDIR%%/admin/jscripts/codemirror/mode/css/scss_test.js
+%%WWWDIR%%/admin/jscripts/codemirror/mode/css/test.js
+%%WWWDIR%%/admin/jscripts/codemirror/mode/htmlmixed/htmlmixed.js
+%%WWWDIR%%/admin/jscripts/codemirror/mode/htmlmixed/index.html
+%%WWWDIR%%/admin/jscripts/codemirror/mode/javascript/index.html
+%%WWWDIR%%/admin/jscripts/codemirror/mode/javascript/javascript.js
+%%WWWDIR%%/admin/jscripts/codemirror/mode/javascript/json-ld.html
+%%WWWDIR%%/admin/jscripts/codemirror/mode/javascript/test.js
+%%WWWDIR%%/admin/jscripts/codemirror/mode/javascript/typescript.html
+%%WWWDIR%%/admin/jscripts/codemirror/mode/xml/index.html
+%%WWWDIR%%/admin/jscripts/codemirror/mode/xml/test.js
+%%WWWDIR%%/admin/jscripts/codemirror/mode/xml/xml.js
+%%WWWDIR%%/admin/jscripts/codemirror/theme/index.html
+%%WWWDIR%%/admin/jscripts/codemirror/theme/mybb.css
 %%WWWDIR%%/admin/jscripts/index.html
+%%WWWDIR%%/admin/jscripts/jqueryui/css/redmond/images/animated-overlay.gif
+%%WWWDIR%%/admin/jscripts/jqueryui/css/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
+%%WWWDIR%%/admin/jscripts/jqueryui/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png
+%%WWWDIR%%/admin/jscripts/jqueryui/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
+%%WWWDIR%%/admin/jscripts/jqueryui/css/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
+%%WWWDIR%%/admin/jscripts/jqueryui/css/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
+%%WWWDIR%%/admin/jscripts/jqueryui/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
+%%WWWDIR%%/admin/jscripts/jqueryui/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
+%%WWWDIR%%/admin/jscripts/jqueryui/css/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
+%%WWWDIR%%/admin/jscripts/jqueryui/css/redmond/images/ui-icons_217bc0_256x240.png
+%%WWWDIR%%/admin/jscripts/jqueryui/css/redmond/images/ui-icons_2e83ff_256x240.png
+%%WWWDIR%%/admin/jscripts/jqueryui/css/redmond/images/ui-icons_469bdd_256x240.png
+%%WWWDIR%%/admin/jscripts/jqueryui/css/redmond/images/ui-icons_6da8d5_256x240.png
+%%WWWDIR%%/admin/jscripts/jqueryui/css/redmond/images/ui-icons_cd0a0a_256x240.png
+%%WWWDIR%%/admin/jscripts/jqueryui/css/redmond/images/ui-icons_d8e7f3_256x240.png
+%%WWWDIR%%/admin/jscripts/jqueryui/css/redmond/images/ui-icons_f9bd01_256x240.png
+%%WWWDIR%%/admin/jscripts/jqueryui/css/redmond/jquery-ui.min.css
+%%WWWDIR%%/admin/jscripts/jqueryui/css/redmond/jquery-ui.structure.min.css
+%%WWWDIR%%/admin/jscripts/jqueryui/css/redmond/jquery-ui.theme.min.css
+%%WWWDIR%%/admin/jscripts/jqueryui/js/jquery-ui.min.js
 %%WWWDIR%%/admin/jscripts/mycode_sandbox.js
 %%WWWDIR%%/admin/jscripts/peeker.js
 %%WWWDIR%%/admin/jscripts/quick_perm_editor.js
+%%WWWDIR%%/admin/jscripts/search.js
 %%WWWDIR%%/admin/jscripts/tabs.js
+%%WWWDIR%%/admin/jscripts/theme_properties.js
 %%WWWDIR%%/admin/jscripts/themes.js
 %%WWWDIR%%/admin/jscripts/users.js
 %%WWWDIR%%/admin/jscripts/view_manager.js
@@ -57,6 +99,7 @@
 %%WWWDIR%%/admin/modules/config/plugins.php
 %%WWWDIR%%/admin/modules/config/post_icons.php
 %%WWWDIR%%/admin/modules/config/profile_fields.php
+%%WWWDIR%%/admin/modules/config/questions.php
 %%WWWDIR%%/admin/modules/config/settings.php
 %%WWWDIR%%/admin/modules/config/smilies.php
 %%WWWDIR%%/admin/modules/config/spiders.php
@@ -73,7 +116,6 @@
 %%WWWDIR%%/admin/modules/home/index.php
 %%WWWDIR%%/admin/modules/home/module_meta.php
 %%WWWDIR%%/admin/modules/home/preferences.php
-%%WWWDIR%%/admin/modules/home/version_check.php
 %%WWWDIR%%/admin/modules/index.html
 %%WWWDIR%%/admin/modules/style/index.html
 %%WWWDIR%%/admin/modules/style/module_meta.php
@@ -91,6 +133,7 @@
 %%WWWDIR%%/admin/modules/tools/optimizedb.php
 %%WWWDIR%%/admin/modules/tools/php_info.php
 %%WWWDIR%%/admin/modules/tools/recount_rebuild.php
+%%WWWDIR%%/admin/modules/tools/spamlog.php
 %%WWWDIR%%/admin/modules/tools/statistics.php
 %%WWWDIR%%/admin/modules/tools/system_health.php
 %%WWWDIR%%/admin/modules/tools/tasks.php
@@ -104,124 +147,53 @@
 %%WWWDIR%%/admin/modules/user/module_meta.php
 %%WWWDIR%%/admin/modules/user/titles.php
 %%WWWDIR%%/admin/modules/user/users.php
-%%WWWDIR%%/admin/styles/default/avatar_gallery.css
+%%WWWDIR%%/admin/styles/default/config.css
 %%WWWDIR%%/admin/styles/default/forum.css
 %%WWWDIR%%/admin/styles/default/home.css
-%%WWWDIR%%/admin/styles/default/images/avatar_gallery.gif
-%%WWWDIR%%/admin/styles/default/images/background.gif
-%%WWWDIR%%/admin/styles/default/images/border-corners.png
-%%WWWDIR%%/admin/styles/default/images/border-sides.png
-%%WWWDIR%%/admin/styles/default/images/border-topbottom.png
-%%WWWDIR%%/admin/styles/default/images/close.gif
-%%WWWDIR%%/admin/styles/default/images/default_avatar.gif
-%%WWWDIR%%/admin/styles/default/images/icons/bullet_off.gif
-%%WWWDIR%%/admin/styles/default/images/icons/bullet_on.gif
-%%WWWDIR%%/admin/styles/default/images/icons/cross.gif
-%%WWWDIR%%/admin/styles/default/images/icons/custom.gif
-%%WWWDIR%%/admin/styles/default/images/icons/decrease.gif
-%%WWWDIR%%/admin/styles/default/images/icons/default.gif
-%%WWWDIR%%/admin/styles/default/images/icons/delete.gif
-%%WWWDIR%%/admin/styles/default/images/icons/error.gif
-%%WWWDIR%%/admin/styles/default/images/icons/find.gif
-%%WWWDIR%%/admin/styles/default/images/icons/group.gif
-%%WWWDIR%%/admin/styles/default/images/icons/increase.gif
-%%WWWDIR%%/admin/styles/default/images/icons/index.html
-%%WWWDIR%%/admin/styles/default/images/icons/logout.gif
-%%WWWDIR%%/admin/styles/default/images/icons/maillogs_thread.gif
-%%WWWDIR%%/admin/styles/default/images/icons/maillogs_user.gif
-%%WWWDIR%%/admin/styles/default/images/icons/make_default.gif
-%%WWWDIR%%/admin/styles/default/images/icons/mobile_user.gif
-%%WWWDIR%%/admin/styles/default/images/icons/no_change.gif
-%%WWWDIR%%/admin/styles/default/images/icons/run_task.gif
-%%WWWDIR%%/admin/styles/default/images/icons/search.gif
-%%WWWDIR%%/admin/styles/default/images/icons/success.gif
-%%WWWDIR%%/admin/styles/default/images/icons/tick.gif
-%%WWWDIR%%/admin/styles/default/images/icons/user.gif
-%%WWWDIR%%/admin/styles/default/images/icons/warning.gif
-%%WWWDIR%%/admin/styles/default/images/icons/world.gif
-%%WWWDIR%%/admin/styles/default/images/index.html
-%%WWWDIR%%/admin/styles/default/images/loading.gif
-%%WWWDIR%%/admin/styles/default/images/login_logo.gif
-%%WWWDIR%%/admin/styles/default/images/logo.gif
-%%WWWDIR%%/admin/styles/default/images/menu_active_bg.gif
-%%WWWDIR%%/admin/styles/default/images/menu_sep.gif
-%%WWWDIR%%/admin/styles/default/images/nav_bit.gif
-%%WWWDIR%%/admin/styles/default/images/page_bg.gif
-%%WWWDIR%%/admin/styles/default/images/popup_down.gif
-%%WWWDIR%%/admin/styles/default/images/sidebar_bg.gif
-%%WWWDIR%%/admin/styles/default/images/sidebar_bg2.gif
+%%WWWDIR%%/admin/styles/default/images/close.png
 %%WWWDIR%%/admin/styles/default/images/spinner.gif
 %%WWWDIR%%/admin/styles/default/images/spinner_big.gif
-%%WWWDIR%%/admin/styles/default/images/submenu_bg.gif
-%%WWWDIR%%/admin/styles/default/images/submit_bg.gif
-%%WWWDIR%%/admin/styles/default/images/templates.gif
-%%WWWDIR%%/admin/styles/default/images/thead_bg.gif
-%%WWWDIR%%/admin/styles/default/imodal.css
+%%WWWDIR%%/admin/styles/default/images/icons/bullet_off.png
+%%WWWDIR%%/admin/styles/default/images/icons/bullet_on.png
+%%WWWDIR%%/admin/styles/default/images/icons/cross.png
+%%WWWDIR%%/admin/styles/default/images/icons/custom.png
+%%WWWDIR%%/admin/styles/default/images/icons/decrease.png
+%%WWWDIR%%/admin/styles/default/images/icons/default.png
+%%WWWDIR%%/admin/styles/default/images/icons/delete.png
+%%WWWDIR%%/admin/styles/default/images/icons/error.png
+%%WWWDIR%%/admin/styles/default/images/icons/find.png
+%%WWWDIR%%/admin/styles/default/images/icons/group.png
+%%WWWDIR%%/admin/styles/default/images/icons/increase.png
+%%WWWDIR%%/admin/styles/default/images/icons/index.html
+%%WWWDIR%%/admin/styles/default/images/icons/logout.png
+%%WWWDIR%%/admin/styles/default/images/icons/maillogs_contact.png
+%%WWWDIR%%/admin/styles/default/images/icons/maillogs_thread.png
+%%WWWDIR%%/admin/styles/default/images/icons/maillogs_user.png
+%%WWWDIR%%/admin/styles/default/images/icons/make_default.png
+%%WWWDIR%%/admin/styles/default/images/icons/mobile_user.png
+%%WWWDIR%%/admin/styles/default/images/icons/no_change.png
+%%WWWDIR%%/admin/styles/default/images/icons/run_task.png
+%%WWWDIR%%/admin/styles/default/images/icons/search.png
+%%WWWDIR%%/admin/styles/default/images/icons/success.png
+%%WWWDIR%%/admin/styles/default/images/icons/tick.png
+%%WWWDIR%%/admin/styles/default/images/icons/user.png
+%%WWWDIR%%/admin/styles/default/images/icons/warning.png
+%%WWWDIR%%/admin/styles/default/images/icons/world.png
+%%WWWDIR%%/admin/styles/default/images/index.html
+%%WWWDIR%%/admin/styles/default/images/login_logo.png
+%%WWWDIR%%/admin/styles/default/images/logo.png
+%%WWWDIR%%/admin/styles/default/images/submit_bg.png
+%%WWWDIR%%/admin/styles/default/images/tcat.png
+%%WWWDIR%%/admin/styles/default/images/thead.png
 %%WWWDIR%%/admin/styles/default/index.html
 %%WWWDIR%%/admin/styles/default/login.css
 %%WWWDIR%%/admin/styles/default/main.css
+%%WWWDIR%%/admin/styles/default/modal.css
 %%WWWDIR%%/admin/styles/default/popup.css
 %%WWWDIR%%/admin/styles/default/style.css
 %%WWWDIR%%/admin/styles/default/style.php
 %%WWWDIR%%/admin/styles/default/user.css
 %%WWWDIR%%/admin/styles/index.html
-%%WWWDIR%%/admin/styles/sharepoint/avatar_gallery.css
-%%WWWDIR%%/admin/styles/sharepoint/home.css
-%%WWWDIR%%/admin/styles/sharepoint/images/default_avatar.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/dropdown_bg.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/dropdown_item.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/bullet_off.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/bullet_on.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/cross.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/custom.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/decrease.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/default.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/delete.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/error.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/find.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/group.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/increase.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/index.html
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/logout.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/maillogs_thread.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/maillogs_user.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/make_default.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/mobile_user.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/no_change.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/run_task.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/search.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/success.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/tick.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/user.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/warning.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/icons/world.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/index.html
-%%WWWDIR%%/admin/styles/sharepoint/images/logo.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/menu_active_bg.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/menu_bg.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/menu_sep.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/nav_bit.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/nav_tab_bg.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/nav_tab_sep.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/nav_tab_start.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/page_bg.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/popup_down.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/sidebar_bg.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/sidebar_bg2.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/spinner.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/spinner_big.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/submenu_bg.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/submit_bg.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/templates.gif
-%%WWWDIR%%/admin/styles/sharepoint/images/thead_bg.gif
-%%WWWDIR%%/admin/styles/sharepoint/index.html
-%%WWWDIR%%/admin/styles/sharepoint/login.css
-%%WWWDIR%%/admin/styles/sharepoint/main.css
-%%WWWDIR%%/admin/styles/sharepoint/popup.css
-%%WWWDIR%%/admin/styles/sharepoint/style.css
-%%WWWDIR%%/admin/styles/sharepoint/style.php
-%%WWWDIR%%/admin/styles/sharepoint/user.css
-%%WWWDIR%%/announcements.php
 %%WWWDIR%%/archive/global.php
 %%WWWDIR%%/archive/index.php
 %%WWWDIR%%/archive/print.css
@@ -231,263 +203,205 @@
 %%WWWDIR%%/cache/themes/index.html
 %%WWWDIR%%/calendar.php
 %%WWWDIR%%/captcha.php
+%%WWWDIR%%/contact.php
 %%WWWDIR%%/css.php
 %%WWWDIR%%/editpost.php
 %%WWWDIR%%/forumdisplay.php
 %%WWWDIR%%/global.php
+%%WWWDIR%%/htaccess-nginx.txt
 %%WWWDIR%%/htaccess.txt
-%%WWWDIR%%/images/add_buddy.gif
-%%WWWDIR%%/images/add_ignore.gif
-%%WWWDIR%%/images/arrow_down.gif
-%%WWWDIR%%/images/attachtypes/blank.gif
-%%WWWDIR%%/images/attachtypes/css.gif
-%%WWWDIR%%/images/attachtypes/doc.gif
-%%WWWDIR%%/images/attachtypes/html.gif
-%%WWWDIR%%/images/attachtypes/image.gif
-%%WWWDIR%%/images/attachtypes/pdf.gif
-%%WWWDIR%%/images/attachtypes/php.gif
-%%WWWDIR%%/images/attachtypes/ppt.gif
-%%WWWDIR%%/images/attachtypes/tar.gif
-%%WWWDIR%%/images/attachtypes/txt.gif
-%%WWWDIR%%/images/attachtypes/unknown.gif
-%%WWWDIR%%/images/attachtypes/xls.gif
-%%WWWDIR%%/images/attachtypes/zip.gif
-%%WWWDIR%%/images/avatars/athlon.gif
-%%WWWDIR%%/images/avatars/blue_bg.gif
-%%WWWDIR%%/images/avatars/butterfly.gif
-%%WWWDIR%%/images/avatars/clear_avatar.gif
-%%WWWDIR%%/images/avatars/courage.jpg
-%%WWWDIR%%/images/avatars/invalid_url.gif
-%%WWWDIR%%/images/avatars/mysql.png
-%%WWWDIR%%/images/avatars/php.gif
-%%WWWDIR%%/images/avatars/spam.gif
-%%WWWDIR%%/images/avatars/stimpy.gif
-%%WWWDIR%%/images/avatars/suckxp.gif
-%%WWWDIR%%/images/avatars/supertux.gif
-%%WWWDIR%%/images/buddies.gif
-%%WWWDIR%%/images/buddy_away.gif
-%%WWWDIR%%/images/buddy_delete.gif
-%%WWWDIR%%/images/buddy_offline.gif
-%%WWWDIR%%/images/buddy_online.gif
-%%WWWDIR%%/images/codebuttons/align_center.gif
-%%WWWDIR%%/images/codebuttons/align_justify.gif
-%%WWWDIR%%/images/codebuttons/align_left.gif
-%%WWWDIR%%/images/codebuttons/align_right.gif
-%%WWWDIR%%/images/codebuttons/bold.gif
-%%WWWDIR%%/images/codebuttons/close_tags.gif
-%%WWWDIR%%/images/codebuttons/code.gif
-%%WWWDIR%%/images/codebuttons/email.gif
-%%WWWDIR%%/images/codebuttons/image.gif
-%%WWWDIR%%/images/codebuttons/italic.gif
-%%WWWDIR%%/images/codebuttons/link.gif
-%%WWWDIR%%/images/codebuttons/list_bullet.gif
-%%WWWDIR%%/images/codebuttons/list_num.gif
-%%WWWDIR%%/images/codebuttons/php.gif
-%%WWWDIR%%/images/codebuttons/quote.gif
-%%WWWDIR%%/images/codebuttons/sep.gif
-%%WWWDIR%%/images/codebuttons/underline.gif
-%%WWWDIR%%/images/collapse.gif
-%%WWWDIR%%/images/collapse_collapsed.gif
-%%WWWDIR%%/images/default_avatar.gif
-%%WWWDIR%%/images/dismiss_notice.gif
-%%WWWDIR%%/images/dot_folder.gif
-%%WWWDIR%%/images/dot_hotfolder.gif
-%%WWWDIR%%/images/dot_hotlockfolder.gif
-%%WWWDIR%%/images/dot_lockfolder.gif
-%%WWWDIR%%/images/dot_newfolder.gif
-%%WWWDIR%%/images/dot_newhotfolder.gif
-%%WWWDIR%%/images/dot_newhotlockfolder.gif
-%%WWWDIR%%/images/dot_newlockfolder.gif
-%%WWWDIR%%/images/english/closed.gif
-%%WWWDIR%%/images/english/newreply.gif
-%%WWWDIR%%/images/english/newthread.gif
-%%WWWDIR%%/images/english/pm_delete.gif
-%%WWWDIR%%/images/english/pm_forward.gif
-%%WWWDIR%%/images/english/pm_reply.gif
-%%WWWDIR%%/images/english/postbit_delete.gif
-%%WWWDIR%%/images/english/postbit_edit.gif
-%%WWWDIR%%/images/english/postbit_email.gif
-%%WWWDIR%%/images/english/postbit_find.gif
-%%WWWDIR%%/images/english/postbit_multiquote.gif
-%%WWWDIR%%/images/english/postbit_multiquote_on.gif
-%%WWWDIR%%/images/english/postbit_pm.gif
-%%WWWDIR%%/images/english/postbit_profile.gif
-%%WWWDIR%%/images/english/postbit_quickquote.gif
-%%WWWDIR%%/images/english/postbit_quote.gif
-%%WWWDIR%%/images/english/postbit_replyall.gif
-%%WWWDIR%%/images/english/postbit_report.gif
-%%WWWDIR%%/images/english/postbit_reputation.gif
-%%WWWDIR%%/images/english/postbit_spam.gif
-%%WWWDIR%%/images/english/postbit_warn.gif
-%%WWWDIR%%/images/english/postbit_www.gif
-%%WWWDIR%%/images/english/rateuser.gif
-%%WWWDIR%%/images/error.gif
-%%WWWDIR%%/images/female.gif
-%%WWWDIR%%/images/folder.gif
-%%WWWDIR%%/images/fw_pm.gif
-%%WWWDIR%%/images/groupimages/english/team-administrator.gif
-%%WWWDIR%%/images/groupimages/english/team-designer.gif
-%%WWWDIR%%/images/groupimages/english/team-developer.gif
-%%WWWDIR%%/images/groupimages/english/team-management.gif
-%%WWWDIR%%/images/groupimages/english/team-mod.gif
-%%WWWDIR%%/images/groupimages/english/team-supermod.gif
-%%WWWDIR%%/images/groupimages/english/team-support.gif
-%%WWWDIR%%/images/groupimages/english/team-tester.gif
-%%WWWDIR%%/images/hotfolder.gif
-%%WWWDIR%%/images/hotlockfolder.gif
-%%WWWDIR%%/images/icons/bell.gif
-%%WWWDIR%%/images/icons/biggrin.gif
-%%WWWDIR%%/images/icons/brick.gif
-%%WWWDIR%%/images/icons/buddy_away.gif
-%%WWWDIR%%/images/icons/bug.gif
-%%WWWDIR%%/images/icons/car.gif
-%%WWWDIR%%/images/icons/exclamation.gif
-%%WWWDIR%%/images/icons/game.gif
-%%WWWDIR%%/images/icons/heart.gif
-%%WWWDIR%%/images/icons/information.gif
-%%WWWDIR%%/images/icons/lightbulb.gif
-%%WWWDIR%%/images/icons/lightning.gif
-%%WWWDIR%%/images/icons/music.gif
-%%WWWDIR%%/images/icons/pencil.gif
-%%WWWDIR%%/images/icons/photo.gif
-%%WWWDIR%%/images/icons/question.gif
-%%WWWDIR%%/images/icons/rainbow.gif
-%%WWWDIR%%/images/icons/sad.gif
-%%WWWDIR%%/images/icons/shield.gif
-%%WWWDIR%%/images/icons/shocked.gif
-%%WWWDIR%%/images/icons/smile.gif
-%%WWWDIR%%/images/icons/sport.gif
-%%WWWDIR%%/images/icons/star.gif
-%%WWWDIR%%/images/icons/thumbsdown.gif
-%%WWWDIR%%/images/icons/thumbsup.gif
-%%WWWDIR%%/images/icons/tongue.gif
-%%WWWDIR%%/images/icons/user.gif
-%%WWWDIR%%/images/icons/video.gif
-%%WWWDIR%%/images/icons/wink.gif
+%%WWWDIR%%/images/arrow_down.png
+%%WWWDIR%%/images/attachtypes/blank.png
+%%WWWDIR%%/images/attachtypes/css.png
+%%WWWDIR%%/images/attachtypes/doc.png
+%%WWWDIR%%/images/attachtypes/html.png
+%%WWWDIR%%/images/attachtypes/image.png
+%%WWWDIR%%/images/attachtypes/pdf.png
+%%WWWDIR%%/images/attachtypes/php.png
+%%WWWDIR%%/images/attachtypes/ppt.png
+%%WWWDIR%%/images/attachtypes/psd.png
+%%WWWDIR%%/images/attachtypes/tar.png
+%%WWWDIR%%/images/attachtypes/txt.png
+%%WWWDIR%%/images/attachtypes/unknown.png
+%%WWWDIR%%/images/attachtypes/xls.png
+%%WWWDIR%%/images/attachtypes/zip.png
+%%WWWDIR%%/images/buddies.png
+%%WWWDIR%%/images/buddy_away.png
+%%WWWDIR%%/images/buddy_delete.png
+%%WWWDIR%%/images/buddy_offline.png
+%%WWWDIR%%/images/buddy_online.png
+%%WWWDIR%%/images/buttons_bg.png
+%%WWWDIR%%/images/buttons_sprite.png
+%%WWWDIR%%/images/close.png
+%%WWWDIR%%/images/collapse.png
+%%WWWDIR%%/images/collapse_collapsed.png
+%%WWWDIR%%/images/colors/black_header.png
+%%WWWDIR%%/images/colors/black_tcat.png
+%%WWWDIR%%/images/colors/black_thead.png
+%%WWWDIR%%/images/colors/calm_header.png
+%%WWWDIR%%/images/colors/calm_tcat.png
+%%WWWDIR%%/images/colors/calm_thead.png
+%%WWWDIR%%/images/colors/dawn_header.png
+%%WWWDIR%%/images/colors/dawn_tcat.png
+%%WWWDIR%%/images/colors/dawn_thead.png
+%%WWWDIR%%/images/colors/earth_header.png
+%%WWWDIR%%/images/colors/earth_tcat.png
+%%WWWDIR%%/images/colors/earth_thead.png
+%%WWWDIR%%/images/colors/flame_header.png
+%%WWWDIR%%/images/colors/flame_tcat.png
+%%WWWDIR%%/images/colors/flame_thead.png
+%%WWWDIR%%/images/colors/leaf_header.png
+%%WWWDIR%%/images/colors/leaf_tcat.png
+%%WWWDIR%%/images/colors/leaf_thead.png
+%%WWWDIR%%/images/colors/night_header.png
+%%WWWDIR%%/images/colors/night_tcat.png
+%%WWWDIR%%/images/colors/night_thead.png
+%%WWWDIR%%/images/colors/sun_header.png
+%%WWWDIR%%/images/colors/sun_tcat.png
+%%WWWDIR%%/images/colors/sun_thead.png
+%%WWWDIR%%/images/colors/twilight_header.png
+%%WWWDIR%%/images/colors/twilight_tcat.png
+%%WWWDIR%%/images/colors/twilight_thead.png
+%%WWWDIR%%/images/colors/water_header.png
+%%WWWDIR%%/images/colors/water_tcat.png
+%%WWWDIR%%/images/colors/water_thead.png
+%%WWWDIR%%/images/default_avatar.png
+%%WWWDIR%%/images/dismiss_notice.png
+%%WWWDIR%%/images/error.png
+%%WWWDIR%%/images/folders_sprite.png
+%%WWWDIR%%/images/forum_icon_sprite.png
+%%WWWDIR%%/images/fw_pm.png
+%%WWWDIR%%/images/groupimages/english/team-administrator.png
+%%WWWDIR%%/images/groupimages/english/team-designer.png
+%%WWWDIR%%/images/groupimages/english/team-developer.png
+%%WWWDIR%%/images/groupimages/english/team-management.png
+%%WWWDIR%%/images/groupimages/english/team-mod.png
+%%WWWDIR%%/images/groupimages/english/team-supermod.png
+%%WWWDIR%%/images/groupimages/english/team-support.png
+%%WWWDIR%%/images/groupimages/english/team-tester.png
+%%WWWDIR%%/images/headerlinks_sprite.png
+%%WWWDIR%%/images/icons/bell.png
+%%WWWDIR%%/images/icons/biggrin.png
+%%WWWDIR%%/images/icons/brick.png
+%%WWWDIR%%/images/icons/bug.png
+%%WWWDIR%%/images/icons/car.png
+%%WWWDIR%%/images/icons/exclamation.png
+%%WWWDIR%%/images/icons/game.png
+%%WWWDIR%%/images/icons/heart.png
+%%WWWDIR%%/images/icons/information.png
+%%WWWDIR%%/images/icons/lightbulb.png
+%%WWWDIR%%/images/icons/lightning.png
+%%WWWDIR%%/images/icons/music.png
+%%WWWDIR%%/images/icons/pencil.png
+%%WWWDIR%%/images/icons/photo.png
+%%WWWDIR%%/images/icons/question.png
+%%WWWDIR%%/images/icons/rainbow.png
+%%WWWDIR%%/images/icons/sad.png
+%%WWWDIR%%/images/icons/shield.png
+%%WWWDIR%%/images/icons/shocked.png
+%%WWWDIR%%/images/icons/smile.png
+%%WWWDIR%%/images/icons/sport.png
+%%WWWDIR%%/images/icons/star.png
+%%WWWDIR%%/images/icons/thumbsdown.png
+%%WWWDIR%%/images/icons/thumbsup.png
+%%WWWDIR%%/images/icons/tongue.png
+%%WWWDIR%%/images/icons/user.png
+%%WWWDIR%%/images/icons/video.png
+%%WWWDIR%%/images/icons/wink.png
 %%WWWDIR%%/images/index.html
-%%WWWDIR%%/images/invalid.gif
-%%WWWDIR%%/images/jump.gif
-%%WWWDIR%%/images/lockfolder.gif
-%%WWWDIR%%/images/logo.gif
-%%WWWDIR%%/images/male.gif
-%%WWWDIR%%/images/minioff.gif
-%%WWWDIR%%/images/miniofflock.gif
-%%WWWDIR%%/images/minion.gif
-%%WWWDIR%%/images/modcp/announcements.gif
-%%WWWDIR%%/images/modcp/banning.gif
-%%WWWDIR%%/images/modcp/editprofile.gif
-%%WWWDIR%%/images/modcp/home.gif
-%%WWWDIR%%/images/modcp/ipsearch.gif
-%%WWWDIR%%/images/modcp/modlogs.gif
-%%WWWDIR%%/images/modcp/modqueue.gif
-%%WWWDIR%%/images/modcp/reports.gif
-%%WWWDIR%%/images/modcp/warninglogs.gif
-%%WWWDIR%%/images/movefolder.gif
-%%WWWDIR%%/images/nav_bit.gif
-%%WWWDIR%%/images/new_pm.gif
-%%WWWDIR%%/images/newfolder.gif
-%%WWWDIR%%/images/newhotfolder.gif
-%%WWWDIR%%/images/newhotlockfolder.gif
-%%WWWDIR%%/images/newlockfolder.gif
-%%WWWDIR%%/images/off.gif
-%%WWWDIR%%/images/offlock.gif
-%%WWWDIR%%/images/old_pm.gif
-%%WWWDIR%%/images/on.gif
-%%WWWDIR%%/images/paperclip.gif
-%%WWWDIR%%/images/pixel.gif
-%%WWWDIR%%/images/pollbar-e.gif
-%%WWWDIR%%/images/pollbar-s.gif
-%%WWWDIR%%/images/pollbar.gif
-%%WWWDIR%%/images/printable.gif
-%%WWWDIR%%/images/re_pm.gif
-%%WWWDIR%%/images/remove_buddy.gif
-%%WWWDIR%%/images/remove_ignore.gif
-%%WWWDIR%%/images/send.gif
-%%WWWDIR%%/images/smilies/angel.gif
-%%WWWDIR%%/images/smilies/angry.gif
-%%WWWDIR%%/images/smilies/arrow.gif
-%%WWWDIR%%/images/smilies/at.gif
-%%WWWDIR%%/images/smilies/biggrin.gif
-%%WWWDIR%%/images/smilies/blank.gif
-%%WWWDIR%%/images/smilies/blush.gif
-%%WWWDIR%%/images/smilies/confused.gif
-%%WWWDIR%%/images/smilies/cool.gif
-%%WWWDIR%%/images/smilies/dodgy.gif
-%%WWWDIR%%/images/smilies/exclamation.gif
-%%WWWDIR%%/images/smilies/heart.gif
-%%WWWDIR%%/images/smilies/huh.gif
-%%WWWDIR%%/images/smilies/lightbulb.gif
-%%WWWDIR%%/images/smilies/my.gif
-%%WWWDIR%%/images/smilies/rolleyes.gif
-%%WWWDIR%%/images/smilies/sad.gif
-%%WWWDIR%%/images/smilies/shy.gif
-%%WWWDIR%%/images/smilies/sleepy.gif
-%%WWWDIR%%/images/smilies/smile.gif
-%%WWWDIR%%/images/smilies/tongue.gif
-%%WWWDIR%%/images/smilies/undecided.gif
-%%WWWDIR%%/images/smilies/wink.gif
-%%WWWDIR%%/images/spacer.gif
+%%WWWDIR%%/images/invalid.png
+%%WWWDIR%%/images/jump.png
+%%WWWDIR%%/images/logo.png
+%%WWWDIR%%/images/logo_white.png
+%%WWWDIR%%/images/mini_status_sprite.png
+%%WWWDIR%%/images/modcp_sprite.png
+%%WWWDIR%%/images/nav_bit.png
+%%WWWDIR%%/images/new_pm.png
+%%WWWDIR%%/images/old_pm.png
+%%WWWDIR%%/images/paperclip.png
+%%WWWDIR%%/images/pollbar.png
+%%WWWDIR%%/images/printable.png
+%%WWWDIR%%/images/re_pm.png
+%%WWWDIR%%/images/send.png
+%%WWWDIR%%/images/showthread_sprite.png
+%%WWWDIR%%/images/smilies/angel.png
+%%WWWDIR%%/images/smilies/angry.png
+%%WWWDIR%%/images/smilies/arrow.png
+%%WWWDIR%%/images/smilies/at.png
+%%WWWDIR%%/images/smilies/biggrin.png
+%%WWWDIR%%/images/smilies/blush.png
+%%WWWDIR%%/images/smilies/confused.png
+%%WWWDIR%%/images/smilies/cool.png
+%%WWWDIR%%/images/smilies/cry.png
+%%WWWDIR%%/images/smilies/dodgy.png
+%%WWWDIR%%/images/smilies/exclamation.png
+%%WWWDIR%%/images/smilies/heart.png
+%%WWWDIR%%/images/smilies/huh.png
+%%WWWDIR%%/images/smilies/lightbulb.png
+%%WWWDIR%%/images/smilies/my.png
+%%WWWDIR%%/images/smilies/rolleyes.png
+%%WWWDIR%%/images/smilies/sad.png
+%%WWWDIR%%/images/smilies/shy.png
+%%WWWDIR%%/images/smilies/sick.png
+%%WWWDIR%%/images/smilies/sleepy.png
+%%WWWDIR%%/images/smilies/smile.png
+%%WWWDIR%%/images/smilies/tongue.png
+%%WWWDIR%%/images/smilies/undecided.png
+%%WWWDIR%%/images/smilies/wink.png
 %%WWWDIR%%/images/spinner.gif
 %%WWWDIR%%/images/spinner_big.gif
-%%WWWDIR%%/images/star.gif
-%%WWWDIR%%/images/star_rating.gif
-%%WWWDIR%%/images/subscribe.gif
-%%WWWDIR%%/images/thead_bg.gif
-%%WWWDIR%%/images/toplinks/calendar.gif
-%%WWWDIR%%/images/toplinks/help.gif
-%%WWWDIR%%/images/toplinks/memberlist.gif
-%%WWWDIR%%/images/toplinks/search.gif
-%%WWWDIR%%/images/unsubscribe.gif
-%%WWWDIR%%/images/usercp/attachments.gif
-%%WWWDIR%%/images/usercp/avatar.gif
-%%WWWDIR%%/images/usercp/composepm.gif
-%%WWWDIR%%/images/usercp/drafts.gif
-%%WWWDIR%%/images/usercp/editfolders.gif
-%%WWWDIR%%/images/usercp/editlists.gif
-%%WWWDIR%%/images/usercp/editsig.gif
-%%WWWDIR%%/images/usercp/email.gif
-%%WWWDIR%%/images/usercp/fsubscriptions.gif
-%%WWWDIR%%/images/usercp/home.gif
-%%WWWDIR%%/images/usercp/notepad.gif
-%%WWWDIR%%/images/usercp/options.gif
-%%WWWDIR%%/images/usercp/password.gif
-%%WWWDIR%%/images/usercp/pmfolder.gif
-%%WWWDIR%%/images/usercp/pmtracking.gif
-%%WWWDIR%%/images/usercp/profile.gif
-%%WWWDIR%%/images/usercp/sub_pmfolder.gif
-%%WWWDIR%%/images/usercp/subscriptions.gif
-%%WWWDIR%%/images/usercp/trash_pmfolder.gif
-%%WWWDIR%%/images/usercp/usergroups.gif
-%%WWWDIR%%/images/usercp/username.gif
-%%WWWDIR%%/images/usercp/viewprofile.gif
-%%WWWDIR%%/images/valid.gif
+%%WWWDIR%%/images/star.png
+%%WWWDIR%%/images/star_rating.png
+%%WWWDIR%%/images/tcat.png
+%%WWWDIR%%/images/thead.png
+%%WWWDIR%%/images/usercp_sprite.png
+%%WWWDIR%%/images/valid.png
+%%WWWDIR%%/inc/3rdparty/2fa/GoogleAuthenticator.php
+%%WWWDIR%%/inc/3rdparty/ayah/ayah.php
+%%WWWDIR%%/inc/3rdparty/ayah/index.html
+%%WWWDIR%%/inc/3rdparty/diff/Diff.php
+%%WWWDIR%%/inc/3rdparty/diff/Diff/Engine/Native.php
+%%WWWDIR%%/inc/3rdparty/diff/Diff/Engine/Shell.php
+%%WWWDIR%%/inc/3rdparty/diff/Diff/Engine/String.php
+%%WWWDIR%%/inc/3rdparty/diff/Diff/Engine/Xdiff.php
 %%WWWDIR%%/inc/3rdparty/diff/Diff/Engine/index.html
-%%WWWDIR%%/inc/3rdparty/diff/Diff/Engine/native.php
-%%WWWDIR%%/inc/3rdparty/diff/Diff/Engine/shell.php
-%%WWWDIR%%/inc/3rdparty/diff/Diff/Engine/string.php
-%%WWWDIR%%/inc/3rdparty/diff/Diff/Engine/xdiff.php
+%%WWWDIR%%/inc/3rdparty/diff/Diff/Exception.php
 %%WWWDIR%%/inc/3rdparty/diff/Diff/Mapped.php
-%%WWWDIR%%/inc/3rdparty/diff/Diff/Renderer/index.html
-%%WWWDIR%%/inc/3rdparty/diff/Diff/Renderer/inline.php
-%%WWWDIR%%/inc/3rdparty/diff/Diff/Renderer/unified.php
+%%WWWDIR%%/inc/3rdparty/diff/Diff/Op/Add.php
+%%WWWDIR%%/inc/3rdparty/diff/Diff/Op/Base.php
+%%WWWDIR%%/inc/3rdparty/diff/Diff/Op/Change.php
+%%WWWDIR%%/inc/3rdparty/diff/Diff/Op/Copy.php
+%%WWWDIR%%/inc/3rdparty/diff/Diff/Op/Delete.php
+%%WWWDIR%%/inc/3rdparty/diff/Diff/Op/index.html
 %%WWWDIR%%/inc/3rdparty/diff/Diff/Renderer.php
+%%WWWDIR%%/inc/3rdparty/diff/Diff/Renderer/Context.php
+%%WWWDIR%%/inc/3rdparty/diff/Diff/Renderer/Inline.php
+%%WWWDIR%%/inc/3rdparty/diff/Diff/Renderer/Unified.php
+%%WWWDIR%%/inc/3rdparty/diff/Diff/Renderer/index.html
+%%WWWDIR%%/inc/3rdparty/diff/Diff/String.php
 %%WWWDIR%%/inc/3rdparty/diff/Diff/ThreeWay.php
+%%WWWDIR%%/inc/3rdparty/diff/Diff/ThreeWay/BlockBuilder.php
+%%WWWDIR%%/inc/3rdparty/diff/Diff/ThreeWay/Op/Base.php
+%%WWWDIR%%/inc/3rdparty/diff/Diff/ThreeWay/Op/Copy.php
+%%WWWDIR%%/inc/3rdparty/diff/Diff/ThreeWay/Op/index.html
+%%WWWDIR%%/inc/3rdparty/diff/Diff/ThreeWay/index.html
 %%WWWDIR%%/inc/3rdparty/diff/Diff/index.html
-%%WWWDIR%%/inc/3rdparty/diff/Diff.php
-%%WWWDIR%%/inc/3rdparty/diff/Diff3.php
 %%WWWDIR%%/inc/3rdparty/diff/index.html
 %%WWWDIR%%/inc/3rdparty/index.html
+%%WWWDIR%%/inc/3rdparty/json/index.html
+%%WWWDIR%%/inc/3rdparty/json/json.php
 %%WWWDIR%%/inc/adminfunctions_templates.php
+%%WWWDIR%%/inc/cachehandlers/apc.php
 %%WWWDIR%%/inc/cachehandlers/disk.php
 %%WWWDIR%%/inc/cachehandlers/eaccelerator.php
 %%WWWDIR%%/inc/cachehandlers/index.html
 %%WWWDIR%%/inc/cachehandlers/memcache.php
+%%WWWDIR%%/inc/cachehandlers/memcached.php
 %%WWWDIR%%/inc/cachehandlers/xcache.php
 %%WWWDIR%%/inc/captcha_fonts/MINYN___.ttf
 %%WWWDIR%%/inc/captcha_fonts/edmunds.ttf
 %%WWWDIR%%/inc/captcha_fonts/index.html
 %%WWWDIR%%/inc/captcha_fonts/read_me.html
-%%WWWDIR%%/inc/class_bitwise.php
 %%WWWDIR%%/inc/class_captcha.php
 %%WWWDIR%%/inc/class_core.php
 %%WWWDIR%%/inc/class_custommoderation.php
@@ -502,17 +416,21 @@
 %%WWWDIR%%/inc/class_parser.php
 %%WWWDIR%%/inc/class_plugins.php
 %%WWWDIR%%/inc/class_session.php
+%%WWWDIR%%/inc/class_stopforumspamchecker.php
 %%WWWDIR%%/inc/class_templates.php
 %%WWWDIR%%/inc/class_timers.php
 %%WWWDIR%%/inc/class_xml.php
-@sample(%%WWWOWN%%) %%WWWDIR%%/inc/config.php.sample
 %%WWWDIR%%/inc/config.default.php
+%%WWWDIR%%/inc/config.php.sample
 %%WWWDIR%%/inc/datahandler.php
 %%WWWDIR%%/inc/datahandlers/event.php
 %%WWWDIR%%/inc/datahandlers/index.html
+%%WWWDIR%%/inc/datahandlers/login.php
 %%WWWDIR%%/inc/datahandlers/pm.php
 %%WWWDIR%%/inc/datahandlers/post.php
 %%WWWDIR%%/inc/datahandlers/user.php
+%%WWWDIR%%/inc/datahandlers/warnings.php
+%%WWWDIR%%/inc/db_base.php
 %%WWWDIR%%/inc/db_mysql.php
 %%WWWDIR%%/inc/db_mysqli.php
 %%WWWDIR%%/inc/db_pdo.php
@@ -521,7 +439,6 @@
 %%WWWDIR%%/inc/functions.php
 %%WWWDIR%%/inc/functions_archive.php
 %%WWWDIR%%/inc/functions_calendar.php
-%%WWWDIR%%/inc/functions_compat.php
 %%WWWDIR%%/inc/functions_forumlist.php
 %%WWWDIR%%/inc/functions_image.php
 %%WWWDIR%%/inc/functions_indicators.php
@@ -540,6 +457,7 @@
 %%WWWDIR%%/inc/functions_warnings.php
 %%WWWDIR%%/inc/index.html
 %%WWWDIR%%/inc/init.php
+%%WWWDIR%%/inc/languages/english.php
 %%WWWDIR%%/inc/languages/english/admin/config_attachment_types.lang.php
 %%WWWDIR%%/inc/languages/english/admin/config_badwords.lang.php
 %%WWWDIR%%/inc/languages/english/admin/config_banning.lang.php
@@ -552,23 +470,23 @@
 %%WWWDIR%%/inc/languages/english/admin/config_plugins.lang.php
 %%WWWDIR%%/inc/languages/english/admin/config_post_icons.lang.php
 %%WWWDIR%%/inc/languages/english/admin/config_profile_fields.lang.php
+%%WWWDIR%%/inc/languages/english/admin/config_questions.lang.php
 %%WWWDIR%%/inc/languages/english/admin/config_settings.lang.php
 %%WWWDIR%%/inc/languages/english/admin/config_smilies.lang.php
 %%WWWDIR%%/inc/languages/english/admin/config_spiders.lang.php
 %%WWWDIR%%/inc/languages/english/admin/config_thread_prefixes.lang.php
 %%WWWDIR%%/inc/languages/english/admin/config_warning.lang.php
-%%WWWDIR%%/inc/languages/english/admin/forum_akismet.lang.php
 %%WWWDIR%%/inc/languages/english/admin/forum_announcements.lang.php
 %%WWWDIR%%/inc/languages/english/admin/forum_attachments.lang.php
 %%WWWDIR%%/inc/languages/english/admin/forum_management.lang.php
 %%WWWDIR%%/inc/languages/english/admin/forum_moderation_queue.lang.php
 %%WWWDIR%%/inc/languages/english/admin/forum_module_meta.lang.php
 %%WWWDIR%%/inc/languages/english/admin/global.lang.php
+%%WWWDIR%%/inc/languages/english/admin/hello.lang.php
 %%WWWDIR%%/inc/languages/english/admin/home_credits.lang.php
 %%WWWDIR%%/inc/languages/english/admin/home_dashboard.lang.php
 %%WWWDIR%%/inc/languages/english/admin/home_module_meta.lang.php
 %%WWWDIR%%/inc/languages/english/admin/home_preferences.lang.php
-%%WWWDIR%%/inc/languages/english/admin/home_version_check.lang.php
 %%WWWDIR%%/inc/languages/english/admin/index.html
 %%WWWDIR%%/inc/languages/english/admin/style_module_meta.lang.php
 %%WWWDIR%%/inc/languages/english/admin/style_templates.lang.php
@@ -584,6 +502,7 @@
 %%WWWDIR%%/inc/languages/english/admin/tools_optimizedb.lang.php
 %%WWWDIR%%/inc/languages/english/admin/tools_php_info.lang.php
 %%WWWDIR%%/inc/languages/english/admin/tools_recount_rebuild.lang.php
+%%WWWDIR%%/inc/languages/english/admin/tools_spamlog.lang.php
 %%WWWDIR%%/inc/languages/english/admin/tools_statistics.lang.php
 %%WWWDIR%%/inc/languages/english/admin/tools_system_health.lang.php
 %%WWWDIR%%/inc/languages/english/admin/tools_tasks.lang.php
@@ -596,19 +515,22 @@
 %%WWWDIR%%/inc/languages/english/admin/user_module_meta.lang.php
 %%WWWDIR%%/inc/languages/english/admin/user_titles.lang.php
 %%WWWDIR%%/inc/languages/english/admin/user_users.lang.php
-%%WWWDIR%%/inc/languages/english/akismet.lang.php
 %%WWWDIR%%/inc/languages/english/announcements.lang.php
 %%WWWDIR%%/inc/languages/english/archive.lang.php
 %%WWWDIR%%/inc/languages/english/calendar.lang.php
+%%WWWDIR%%/inc/languages/english/contact.lang.php
 %%WWWDIR%%/inc/languages/english/customhelpdocs.lang.php
 %%WWWDIR%%/inc/languages/english/customhelpsections.lang.php
 %%WWWDIR%%/inc/languages/english/datahandler_event.lang.php
+%%WWWDIR%%/inc/languages/english/datahandler_login.lang.php
 %%WWWDIR%%/inc/languages/english/datahandler_pm.lang.php
 %%WWWDIR%%/inc/languages/english/datahandler_post.lang.php
 %%WWWDIR%%/inc/languages/english/datahandler_user.lang.php
+%%WWWDIR%%/inc/languages/english/datahandler_warnings.lang.php
 %%WWWDIR%%/inc/languages/english/editpost.lang.php
 %%WWWDIR%%/inc/languages/english/forumdisplay.lang.php
 %%WWWDIR%%/inc/languages/english/global.lang.php
+%%WWWDIR%%/inc/languages/english/hello.lang.php
 %%WWWDIR%%/inc/languages/english/helpdocs.lang.php
 %%WWWDIR%%/inc/languages/english/helpsections.lang.php
 %%WWWDIR%%/inc/languages/english/index.html
@@ -641,16 +563,14 @@
 %%WWWDIR%%/inc/languages/english/usercpnav.lang.php
 %%WWWDIR%%/inc/languages/english/warnings.lang.php
 %%WWWDIR%%/inc/languages/english/xmlhttp.lang.php
-%%WWWDIR%%/inc/languages/english.php
 %%WWWDIR%%/inc/languages/index.html
 %%WWWDIR%%/inc/mailhandlers/index.html
 %%WWWDIR%%/inc/mailhandlers/php.php
 %%WWWDIR%%/inc/mailhandlers/smtp.php
 %%WWWDIR%%/inc/mybb_group.php
-%%WWWDIR%%/inc/plugins/akismet.php
 %%WWWDIR%%/inc/plugins/hello.php
 %%WWWDIR%%/inc/plugins/index.html
-@sample(%%WWWOWN%%) %%WWWDIR%%/inc/settings.php.sample
+%%WWWDIR%%/inc/settings.php.sample
 %%WWWDIR%%/inc/tasks/backupdb.php
 %%WWWDIR%%/inc/tasks/checktables.php
 %%WWWDIR%%/inc/tasks/dailycleanup.php
@@ -660,34 +580,26 @@
 %%WWWDIR%%/inc/tasks/logcleanup.php
 %%WWWDIR%%/inc/tasks/massmail.php
 %%WWWDIR%%/inc/tasks/promotions.php
+%%WWWDIR%%/inc/tasks/recachestylesheets.php
 %%WWWDIR%%/inc/tasks/threadviews.php
 %%WWWDIR%%/inc/tasks/usercleanup.php
 %%WWWDIR%%/inc/tasks/userpruning.php
+%%WWWDIR%%/inc/tasks/versioncheck.php
 %%WWWDIR%%/index.php
-%%WWWDIR%%/install/images/bullet.gif
-%%WWWDIR%%/install/images/content_bg.gif
-%%WWWDIR%%/install/images/error_bg.gif
-%%WWWDIR%%/install/images/h2-admin.gif
-%%WWWDIR%%/install/images/h2-config.gif
-%%WWWDIR%%/install/images/h2-createtables.gif
-%%WWWDIR%%/install/images/h2-dbconfig.gif
-%%WWWDIR%%/install/images/h2-finish.gif
-%%WWWDIR%%/install/images/h2-license.gif
-%%WWWDIR%%/install/images/h2-requirements.gif
-%%WWWDIR%%/install/images/h2-tablepopulate.gif
-%%WWWDIR%%/install/images/h2-theme.gif
-%%WWWDIR%%/install/images/h2-welcome.gif
+%%WWWDIR%%/install/images/active.png
+%%WWWDIR%%/install/images/inactive.png
 %%WWWDIR%%/install/images/index.html
-%%WWWDIR%%/install/images/logo.gif
-%%WWWDIR%%/install/images/submit_bg.gif
-%%WWWDIR%%/install/images/tcat_bg.gif
-%%WWWDIR%%/install/images/thead_bg.gif
+%%WWWDIR%%/install/images/logo.png
+%%WWWDIR%%/install/images/submit_bg.png
+%%WWWDIR%%/install/images/tcat.png
+%%WWWDIR%%/install/images/thead.png
 %%WWWDIR%%/install/index.php
 %%WWWDIR%%/install/resources/adminoptions.xml
 %%WWWDIR%%/install/resources/adminviews.xml
 %%WWWDIR%%/install/resources/index.html
 %%WWWDIR%%/install/resources/language.lang.php
 %%WWWDIR%%/install/resources/mybb_theme.xml
+%%WWWDIR%%/install/resources/mybb_theme_colors.xml
 %%WWWDIR%%/install/resources/mysql_db_inserts.php
 %%WWWDIR%%/install/resources/mysql_db_tables.php
 %%WWWDIR%%/install/resources/output.php
@@ -713,7 +625,16 @@
 %%WWWDIR%%/install/resources/upgrade23.php
 %%WWWDIR%%/install/resources/upgrade24.php
 %%WWWDIR%%/install/resources/upgrade25.php
+%%WWWDIR%%/install/resources/upgrade26.php
+%%WWWDIR%%/install/resources/upgrade27.php
+%%WWWDIR%%/install/resources/upgrade28.php
+%%WWWDIR%%/install/resources/upgrade29.php
 %%WWWDIR%%/install/resources/upgrade3.php
+%%WWWDIR%%/install/resources/upgrade30.php
+%%WWWDIR%%/install/resources/upgrade31.php
+%%WWWDIR%%/install/resources/upgrade32.php
+%%WWWDIR%%/install/resources/upgrade33.php
+%%WWWDIR%%/install/resources/upgrade34.php
 %%WWWDIR%%/install/resources/upgrade4.php
 %%WWWDIR%%/install/resources/upgrade5.php
 %%WWWDIR%%/install/resources/upgrade6.php
@@ -723,43 +644,96 @@
 %%WWWDIR%%/install/resources/usergroups.xml
 %%WWWDIR%%/install/stylesheet.css
 %%WWWDIR%%/install/upgrade.php
-%%WWWDIR%%/jscripts/autocomplete.js
+%%WWWDIR%%/jscripts/bbcodes_sceditor.js
 %%WWWDIR%%/jscripts/captcha.js
-%%WWWDIR%%/jscripts/controls.js
-%%WWWDIR%%/jscripts/dragdrop.js
-%%WWWDIR%%/jscripts/editor.js
-%%WWWDIR%%/jscripts/editor_themes/Office_2007/images/color.gif
-%%WWWDIR%%/jscripts/editor_themes/Office_2007/images/dropdown2.gif
-%%WWWDIR%%/jscripts/editor_themes/Office_2007/images/index.html
-%%WWWDIR%%/jscripts/editor_themes/Office_2007/images/television.gif
-%%WWWDIR%%/jscripts/editor_themes/Office_2007/images/toolbar.gif
-%%WWWDIR%%/jscripts/editor_themes/Office_2007/images/ui.gif
-%%WWWDIR%%/jscripts/editor_themes/Office_2007/index.html
-%%WWWDIR%%/jscripts/editor_themes/Office_2007/stylesheet.css
-%%WWWDIR%%/jscripts/editor_themes/default/images/color.gif
-%%WWWDIR%%/jscripts/editor_themes/default/images/dropdown.gif
-%%WWWDIR%%/jscripts/editor_themes/default/images/dropdown2.gif
-%%WWWDIR%%/jscripts/editor_themes/default/images/index.html
-%%WWWDIR%%/jscripts/editor_themes/default/images/separator.gif
-%%WWWDIR%%/jscripts/editor_themes/default/images/television.gif
-%%WWWDIR%%/jscripts/editor_themes/default/images/toolbar.gif
-%%WWWDIR%%/jscripts/editor_themes/default/index.html
-%%WWWDIR%%/jscripts/editor_themes/default/stylesheet.css
-%%WWWDIR%%/jscripts/editor_themes/index.html
-%%WWWDIR%%/jscripts/effects.js
 %%WWWDIR%%/jscripts/general.js
 %%WWWDIR%%/jscripts/index.html
 %%WWWDIR%%/jscripts/inline_edit.js
 %%WWWDIR%%/jscripts/inline_moderation.js
-%%WWWDIR%%/jscripts/popup_menu.js
+%%WWWDIR%%/jscripts/jeditable/jeditable.min.js
+%%WWWDIR%%/jscripts/jquery.js
+%%WWWDIR%%/jscripts/jquery.plugins.js
+%%WWWDIR%%/jscripts/jquery.plugins.min.js
 %%WWWDIR%%/jscripts/post.js
-%%WWWDIR%%/jscripts/prototype.js
+%%WWWDIR%%/jscripts/question.js
 %%WWWDIR%%/jscripts/rating.js
-%%WWWDIR%%/jscripts/scriptaculous.js
-%%WWWDIR%%/jscripts/slider.js
+%%WWWDIR%%/jscripts/report.js
+%%WWWDIR%%/jscripts/sceditor/editor_plugins/bbcode.js
+%%WWWDIR%%/jscripts/sceditor/editor_plugins/format.js
+%%WWWDIR%%/jscripts/sceditor/editor_plugins/index.html
+%%WWWDIR%%/jscripts/sceditor/editor_plugins/undo.js
+%%WWWDIR%%/jscripts/sceditor/editor_plugins/xhtml.js
+%%WWWDIR%%/jscripts/sceditor/editor_themes/buttons.css
+%%WWWDIR%%/jscripts/sceditor/editor_themes/default.css
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/alien.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/angel.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/angry.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/blink.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/blush.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/cheerful.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/cool.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/credits.txt
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/cwy.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/devil.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/dizzy.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/ermm.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/face.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/getlost.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/grin.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/happy.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/heart.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/kissing.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/laughing.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/ninja.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/pinch.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/pouty.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/sad.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/shocked.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/sick.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/sideways.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/silly.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/sleeping.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/smile.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/tongue.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/unsure.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/w00t.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/wassat.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/whistling.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/wink.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/emoticons/wub.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/famfamfam.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/index.html
+%%WWWDIR%%/jscripts/sceditor/editor_themes/modern.css
+%%WWWDIR%%/jscripts/sceditor/editor_themes/monocons.css
+%%WWWDIR%%/jscripts/sceditor/editor_themes/monocons/monocons.eot
+%%WWWDIR%%/jscripts/sceditor/editor_themes/monocons/monocons.ttf
+%%WWWDIR%%/jscripts/sceditor/editor_themes/mybb.css
+%%WWWDIR%%/jscripts/sceditor/editor_themes/office-toolbar.css
+%%WWWDIR%%/jscripts/sceditor/editor_themes/office.css
+%%WWWDIR%%/jscripts/sceditor/editor_themes/php.png
+%%WWWDIR%%/jscripts/sceditor/editor_themes/square.css
+%%WWWDIR%%/jscripts/sceditor/editor_themes/video.png
+%%WWWDIR%%/jscripts/sceditor/jquery.sceditor.bbcode.min.js
+%%WWWDIR%%/jscripts/sceditor/jquery.sceditor.default.min.css
+%%WWWDIR%%/jscripts/sceditor/jquery.sceditor.min.js
+%%WWWDIR%%/jscripts/sceditor/jquery.sceditor.xhtml.min.js
+%%WWWDIR%%/jscripts/sceditor/textarea_styles/jquery.sceditor.buttons.css
+%%WWWDIR%%/jscripts/sceditor/textarea_styles/jquery.sceditor.default.css
+%%WWWDIR%%/jscripts/sceditor/textarea_styles/jquery.sceditor.modern.css
+%%WWWDIR%%/jscripts/sceditor/textarea_styles/jquery.sceditor.monocons.css
+%%WWWDIR%%/jscripts/sceditor/textarea_styles/jquery.sceditor.mybb.css
+%%WWWDIR%%/jscripts/sceditor/textarea_styles/jquery.sceditor.office-toolbar.css
+%%WWWDIR%%/jscripts/sceditor/textarea_styles/jquery.sceditor.office.css
+%%WWWDIR%%/jscripts/sceditor/textarea_styles/jquery.sceditor.square.css
+%%WWWDIR%%/jscripts/select2/select2-spinner.gif
+%%WWWDIR%%/jscripts/select2/select2.css
+%%WWWDIR%%/jscripts/select2/select2.min.js
+%%WWWDIR%%/jscripts/select2/select2.png
+%%WWWDIR%%/jscripts/select2/select2x2.png
 %%WWWDIR%%/jscripts/thread.js
 %%WWWDIR%%/jscripts/usercp.js
-%%WWWDIR%%/jscripts/validator.js
+%%WWWDIR%%/jscripts/validate/additional-methods.min.js
+%%WWWDIR%%/jscripts/validate/jquery.validate.min.js
 %%WWWDIR%%/managegroup.php
 %%WWWDIR%%/member.php
 %%WWWDIR%%/memberlist.php
@@ -774,6 +748,7 @@
 %%WWWDIR%%/printthread.php
 %%WWWDIR%%/private.php
 %%WWWDIR%%/ratethread.php
+%%WWWDIR%%/readme.md
 %%WWWDIR%%/report.php
 %%WWWDIR%%/reputation.php
 %%WWWDIR%%/rss.php