5 files changed, 199 insertions, 251 deletions

diff --git a/www/phpbb/Makefile b/www/phpbb/Makefile
index ae28dc9ddbd2..ef9ff8145632 100644
--- a/www/phpbb/Makefile
+++ b/www/phpbb/Makefile
@@ -6,18 +6,19 @@
 #
 
 PORTNAME=	phpbb
-PORTVERSION=	2.0.5
-PORTREVISION=	1
+PORTVERSION=	2.0.6
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	phpBB-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	liukang@bjpu.edu.cn
 COMMENT=	A PHP-based bulletin board / discussion forum system
 
 RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear-PEAR
 
+USE_BZIP2=	yes
+
 # The phpBB2 port supports a number of variables that may be tweaked at build
 # time.  Perform a "make options" to see more information on these variables.
 #
@@ -59,8 +60,6 @@ pre-everything::
 post-patch:
 	@ ${REINPLACE_CMD} -e "s#\.\./templates#/${PHPBBURL}/templates#" \
 	  ${WRKSRC}/docs/*.html
-	@ ${RM} ${WRKSRC}/viewtopic.php.orig
-	@ ${RM} ${WRKSRC}/admin/admin_styles.php.orig
 
 post-configure:
 	@ ${SED} \
diff --git a/www/phpbb/distinfo b/www/phpbb/distinfo
index f4e08cd86d12..7680683bc7f9 100644
--- a/www/phpbb/distinfo
+++ b/www/phpbb/distinfo
@@ -1 +1 @@
-MD5 (phpBB-2.0.5.tar.gz) = 602cf40b6ea57c042a83e394f0722fef
+MD5 (phpBB-2.0.6.tar.bz2) = 28f20c82fce9ad6329b937c967eb1c72
diff --git a/www/phpbb/files/patch-admin::admin_styles.php b/www/phpbb/files/patch-admin::admin_styles.php
deleted file mode 100644
index 04f9c2048643..000000000000
--- a/www/phpbb/files/patch-admin::admin_styles.php
+++ /dev/null
@@ -1,24 +0,0 @@
---- admin/admin_styles.php.orig	Sun Dec 22 04:09:58 2002
-+++ admin/admin_styles.php	Mon Jul  7 12:59:05 2003
-@@ -39,16 +39,14 @@
- // Check if the user has cancled a confirmation message.
- //
- $phpbb_root_path = "./../";
-+require($phpbb_root_path . 'extension.inc');
- 
- $confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE;
- $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE;
- 
--if (empty($HTTP_POST_VARS['send_file']))
--{
--	$no_page_header = ( $cancel ) ? TRUE : FALSE;
--	require($phpbb_root_path . 'extension.inc');
--	require('./pagestart.' . $phpEx);
--}
-+$no_page_header = (!empty($HTTP_POST_VARS['send_file']) || $cancel) ? TRUE : FALSE;
-+
-+require('./pagestart.' . $phpEx);
- 
- if ($cancel)
- {
-
diff --git a/www/phpbb/files/patch-viewtopic.php b/www/phpbb/files/patch-viewtopic.php
deleted file mode 100644
index 857e844f41a7..000000000000
--- a/www/phpbb/files/patch-viewtopic.php
+++ /dev/null
@@ -1,27 +0,0 @@
---- viewtopic.php.orig	Mon Jul  7 12:23:41 2003
-+++ viewtopic.php	Mon Jul  7 12:25:01 2003
-@@ -29,6 +29,7 @@
- //
- // Start initial var setup
- //
-+$topic_id = $post_id = false;
- if ( isset($HTTP_GET_VARS[POST_TOPIC_URL]) )
- {
- 	$topic_id = intval($HTTP_GET_VARS[POST_TOPIC_URL]);
-@@ -134,11 +135,11 @@
- // also allows for direct linking to a post (and the calculation of which
- // page the post is on and the correct display of viewtopic)
- //
--$join_sql_table = ( !isset($post_id) ) ? '' : ", " . POSTS_TABLE . " p, " . POSTS_TABLE . " p2 ";
--$join_sql = ( !isset($post_id) ) ? "t.topic_id = $topic_id" : "p.post_id = $post_id AND t.topic_id = p.topic_id AND p2.topic_id = p.topic_id AND p2.post_id <= $post_id";
--$count_sql = ( !isset($post_id) ) ? '' : ", COUNT(p2.post_id) AS prev_posts";
-+$join_sql_table = ( empty($post_id) ) ? '' : ", " . POSTS_TABLE . " p, " . POSTS_TABLE . " p2 ";
-+$join_sql = ( empty($post_id) ) ? "t.topic_id = $topic_id" : "p.post_id = $post_id AND t.topic_id = p.topic_id AND p2.topic_id = p.topic_id AND p2.post_id <= $post_id";
-+$count_sql = ( empty($post_id) ) ? '' : ", COUNT(p2.post_id) AS prev_posts";
- 
--$order_sql = ( !isset($post_id) ) ? '' : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, t.topic_last_post_id, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments ORDER BY p.post_id ASC";
-+$order_sql = ( empty($post_id) ) ? '' : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, t.topic_last_post_id, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments ORDER BY p.post_id ASC";
- 
- $sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, t.topic_last_post_id, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments" . $count_sql . "
- 	FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f" . $join_sql_table . "
-
diff --git a/www/phpbb/pkg-plist b/www/phpbb/pkg-plist
index 7e21422b84d5..0d06f7d51791 100644
--- a/www/phpbb/pkg-plist
+++ b/www/phpbb/pkg-plist
@@ -8,135 +8,135 @@ share/phpbb/contrib/README.html
 share/phpbb/contrib/dbinformer.php
 share/phpbb/contrib/template_db_cache.php
 share/phpbb/contrib/template_file_cache.php
-share/phpbb/contrib/visual_confirmation.zip
+share/phpbb/contrib/visual_confirmation.tar.bz2
 share/phpbb/install.php
-share/phpbb/update_to_205.php
+share/phpbb/update_to_206.php
 share/phpbb/upgrade.php
-%%PHPBBDIR%%/admin/admin_forum_prune.php
-%%PHPBBDIR%%/admin/admin_mass_email.php
-%%PHPBBDIR%%/admin/admin_users.php
 %%PHPBBDIR%%/admin/admin_board.php
-%%PHPBBDIR%%/admin/pagestart.php
-%%PHPBBDIR%%/admin/admin_smilies.php
-%%PHPBBDIR%%/admin/page_header_admin.php
+%%PHPBBDIR%%/admin/admin_db_utilities.php
 %%PHPBBDIR%%/admin/admin_disallow.php
+%%PHPBBDIR%%/admin/admin_forum_prune.php
+%%PHPBBDIR%%/admin/admin_forumauth.php
 %%PHPBBDIR%%/admin/admin_forums.php
-%%PHPBBDIR%%/admin/admin_styles.php
-%%PHPBBDIR%%/admin/index.php
-%%PHPBBDIR%%/admin/admin_words.php
 %%PHPBBDIR%%/admin/admin_groups.php
-%%PHPBBDIR%%/admin/page_footer_admin.php
-%%PHPBBDIR%%/admin/admin_user_ban.php
-%%PHPBBDIR%%/admin/admin_forumauth.php
-%%PHPBBDIR%%/admin/admin_db_utilities.php
+%%PHPBBDIR%%/admin/admin_mass_email.php
 %%PHPBBDIR%%/admin/admin_ranks.php
+%%PHPBBDIR%%/admin/admin_smilies.php
+%%PHPBBDIR%%/admin/admin_styles.php
 %%PHPBBDIR%%/admin/admin_ug_auth.php
+%%PHPBBDIR%%/admin/admin_user_ban.php
+%%PHPBBDIR%%/admin/admin_users.php
+%%PHPBBDIR%%/admin/admin_words.php
+%%PHPBBDIR%%/admin/index.php
+%%PHPBBDIR%%/admin/page_footer_admin.php
+%%PHPBBDIR%%/admin/page_header_admin.php
+%%PHPBBDIR%%/admin/pagestart.php
 %%PHPBBDIR%%/cache/.htaccess
 %%PHPBBDIR%%/cache/index.htm
 %%PHPBBDIR%%/common.php
+%%PHPBBDIR%%/db/db2.php
+%%PHPBBDIR%%/db/index.htm
+%%PHPBBDIR%%/db/msaccess.php
 %%PHPBBDIR%%/db/mssql-odbc.php
-%%PHPBBDIR%%/db/oracle.php
 %%PHPBBDIR%%/db/mssql.php
-%%PHPBBDIR%%/db/mysql4.php
-%%PHPBBDIR%%/db/msaccess.php
-%%PHPBBDIR%%/db/index.htm
 %%PHPBBDIR%%/db/mysql.php
+%%PHPBBDIR%%/db/mysql4.php
+%%PHPBBDIR%%/db/oracle.php
 %%PHPBBDIR%%/db/postgres7.php
-%%PHPBBDIR%%/db/db2.php
 %%PHPBBDIR%%/extension.inc
 %%PHPBBDIR%%/faq.php
 %%PHPBBDIR%%/groupcp.php
-%%PHPBBDIR%%/images/avatars/index.htm
 %%PHPBBDIR%%/images/avatars/gallery/index.htm
+%%PHPBBDIR%%/images/avatars/index.htm
 %%PHPBBDIR%%/images/index.htm
-%%PHPBBDIR%%/images/smiles/icon_confused.gif
-%%PHPBBDIR%%/images/smiles/icon_idea.gif
+%%PHPBBDIR%%/images/smiles/icon_arrow.gif
 %%PHPBBDIR%%/images/smiles/icon_biggrin.gif
+%%PHPBBDIR%%/images/smiles/icon_confused.gif
 %%PHPBBDIR%%/images/smiles/icon_cool.gif
 %%PHPBBDIR%%/images/smiles/icon_cry.gif
-%%PHPBBDIR%%/images/smiles/icon_mrgreen.gif
-%%PHPBBDIR%%/images/smiles/icon_sad.gif
 %%PHPBBDIR%%/images/smiles/icon_eek.gif
-%%PHPBBDIR%%/images/smiles/icon_exclaim.gif
-%%PHPBBDIR%%/images/smiles/icon_rolleyes.gif
 %%PHPBBDIR%%/images/smiles/icon_evil.gif
-%%PHPBBDIR%%/images/smiles/icon_wink.gif
-%%PHPBBDIR%%/images/smiles/icon_razz.gif
-%%PHPBBDIR%%/images/smiles/icon_twisted.gif
-%%PHPBBDIR%%/images/smiles/icon_mad.gif
+%%PHPBBDIR%%/images/smiles/icon_exclaim.gif
 %%PHPBBDIR%%/images/smiles/icon_frown.gif
+%%PHPBBDIR%%/images/smiles/icon_idea.gif
 %%PHPBBDIR%%/images/smiles/icon_lol.gif
-%%PHPBBDIR%%/images/smiles/icon_surprised.gif
-%%PHPBBDIR%%/images/smiles/icon_question.gif
+%%PHPBBDIR%%/images/smiles/icon_mad.gif
+%%PHPBBDIR%%/images/smiles/icon_mrgreen.gif
 %%PHPBBDIR%%/images/smiles/icon_neutral.gif
-%%PHPBBDIR%%/images/smiles/icon_smile.gif
+%%PHPBBDIR%%/images/smiles/icon_question.gif
+%%PHPBBDIR%%/images/smiles/icon_razz.gif
 %%PHPBBDIR%%/images/smiles/icon_redface.gif
-%%PHPBBDIR%%/images/smiles/icon_arrow.gif
+%%PHPBBDIR%%/images/smiles/icon_rolleyes.gif
+%%PHPBBDIR%%/images/smiles/icon_sad.gif
+%%PHPBBDIR%%/images/smiles/icon_smile.gif
+%%PHPBBDIR%%/images/smiles/icon_surprised.gif
+%%PHPBBDIR%%/images/smiles/icon_twisted.gif
+%%PHPBBDIR%%/images/smiles/icon_wink.gif
 %%PHPBBDIR%%/images/spacer.gif
 @exec mkdir -p %B/avatars/upload
-%%PHPBBDIR%%/includes/usercp_register.php
-%%PHPBBDIR%%/includes/sessions.php
-%%PHPBBDIR%%/includes/functions_search.php
-%%PHPBBDIR%%/includes/functions_admin.php
-%%PHPBBDIR%%/includes/functions.php
 %%PHPBBDIR%%/includes/auth.php
-%%PHPBBDIR%%/includes/page_header.php
-%%PHPBBDIR%%/includes/usercp_sendpasswd.php
-%%PHPBBDIR%%/includes/emailer.php
-%%PHPBBDIR%%/includes/db.php
 %%PHPBBDIR%%/includes/bbcode.php
-%%PHPBBDIR%%/includes/usercp_avatar.php
 %%PHPBBDIR%%/includes/constants.php
+%%PHPBBDIR%%/includes/db.php
+%%PHPBBDIR%%/includes/emailer.php
+%%PHPBBDIR%%/includes/functions.php
+%%PHPBBDIR%%/includes/functions_admin.php
+%%PHPBBDIR%%/includes/functions_post.php
+%%PHPBBDIR%%/includes/functions_search.php
+%%PHPBBDIR%%/includes/functions_selects.php
+%%PHPBBDIR%%/includes/functions_validate.php
 %%PHPBBDIR%%/includes/index.htm
+%%PHPBBDIR%%/includes/page_header.php
 %%PHPBBDIR%%/includes/page_tail.php
-%%PHPBBDIR%%/includes/topic_review.php
 %%PHPBBDIR%%/includes/prune.php
-%%PHPBBDIR%%/includes/usercp_activate.php
-%%PHPBBDIR%%/includes/usercp_viewprofile.php
-%%PHPBBDIR%%/includes/template.php
-%%PHPBBDIR%%/includes/functions_selects.php
-%%PHPBBDIR%%/includes/functions_validate.php
+%%PHPBBDIR%%/includes/sessions.php
+%%PHPBBDIR%%/includes/smtp.php
 %%PHPBBDIR%%/includes/sql_parse.php
+%%PHPBBDIR%%/includes/template.php
+%%PHPBBDIR%%/includes/topic_review.php
+%%PHPBBDIR%%/includes/usercp_activate.php
+%%PHPBBDIR%%/includes/usercp_avatar.php
 %%PHPBBDIR%%/includes/usercp_email.php
-%%PHPBBDIR%%/includes/functions_post.php
-%%PHPBBDIR%%/includes/smtp.php
+%%PHPBBDIR%%/includes/usercp_register.php
+%%PHPBBDIR%%/includes/usercp_sendpasswd.php
+%%PHPBBDIR%%/includes/usercp_viewprofile.php
 %%PHPBBDIR%%/index.php
+%%PHPBBDIR%%/install/index.htm
 %%PHPBBDIR%%/install/install.php
-%%PHPBBDIR%%/install/upgrade.php
-%%PHPBBDIR%%/install/schemas/mysql_basic.sql
+%%PHPBBDIR%%/install/schemas/index.htm
 %%PHPBBDIR%%/install/schemas/ms_access_primer.zip
-%%PHPBBDIR%%/install/schemas/postgres_basic.sql
 %%PHPBBDIR%%/install/schemas/mssql_basic.sql
-%%PHPBBDIR%%/install/schemas/index.htm
-%%PHPBBDIR%%/install/schemas/postgres_schema.sql
-%%PHPBBDIR%%/install/schemas/mysql_schema.sql
 %%PHPBBDIR%%/install/schemas/mssql_schema.sql
-%%PHPBBDIR%%/install/update_to_205.php
-%%PHPBBDIR%%/install/index.htm
-%%PHPBBDIR%%/language/lang_english/lang_faq.php
+%%PHPBBDIR%%/install/schemas/mysql_basic.sql
+%%PHPBBDIR%%/install/schemas/mysql_schema.sql
+%%PHPBBDIR%%/install/schemas/postgres_basic.sql
+%%PHPBBDIR%%/install/schemas/postgres_schema.sql
+%%PHPBBDIR%%/install/update_to_206.php
+%%PHPBBDIR%%/install/upgrade.php
+%%PHPBBDIR%%/language/index.htm
 %%PHPBBDIR%%/language/lang_english/email/admin_activate.tpl
-%%PHPBBDIR%%/language/lang_english/email/topic_notify.tpl
+%%PHPBBDIR%%/language/lang_english/email/admin_send_email.tpl
+%%PHPBBDIR%%/language/lang_english/email/admin_welcome_activated.tpl
+%%PHPBBDIR%%/language/lang_english/email/admin_welcome_inactive.tpl
+%%PHPBBDIR%%/language/lang_english/email/coppa_welcome_inactive.tpl
 %%PHPBBDIR%%/language/lang_english/email/group_added.tpl
-%%PHPBBDIR%%/language/lang_english/email/privmsg_notify.tpl
 %%PHPBBDIR%%/language/lang_english/email/group_approved.tpl
-%%PHPBBDIR%%/language/lang_english/email/user_welcome_inactive.tpl
-%%PHPBBDIR%%/language/lang_english/email/index.htm
 %%PHPBBDIR%%/language/lang_english/email/group_request.tpl
-%%PHPBBDIR%%/language/lang_english/email/admin_send_email.tpl
-%%PHPBBDIR%%/language/lang_english/email/user_welcome.tpl
-%%PHPBBDIR%%/language/lang_english/email/user_activate.tpl
+%%PHPBBDIR%%/language/lang_english/email/index.htm
+%%PHPBBDIR%%/language/lang_english/email/privmsg_notify.tpl
 %%PHPBBDIR%%/language/lang_english/email/profile_send_email.tpl
-%%PHPBBDIR%%/language/lang_english/email/admin_welcome_inactive.tpl
+%%PHPBBDIR%%/language/lang_english/email/topic_notify.tpl
+%%PHPBBDIR%%/language/lang_english/email/user_activate.tpl
 %%PHPBBDIR%%/language/lang_english/email/user_activate_passwd.tpl
-%%PHPBBDIR%%/language/lang_english/email/admin_welcome_activated.tpl
-%%PHPBBDIR%%/language/lang_english/email/coppa_welcome_inactive.tpl
+%%PHPBBDIR%%/language/lang_english/email/user_welcome.tpl
+%%PHPBBDIR%%/language/lang_english/email/user_welcome_inactive.tpl
+%%PHPBBDIR%%/language/lang_english/index.htm
 %%PHPBBDIR%%/language/lang_english/lang_admin.php
+%%PHPBBDIR%%/language/lang_english/lang_bbcode.php
+%%PHPBBDIR%%/language/lang_english/lang_faq.php
 %%PHPBBDIR%%/language/lang_english/lang_main.php
 %%PHPBBDIR%%/language/lang_english/search_stopwords.txt
-%%PHPBBDIR%%/language/lang_english/lang_bbcode.php
 %%PHPBBDIR%%/language/lang_english/search_synonyms.txt
-%%PHPBBDIR%%/language/lang_english/index.htm
-%%PHPBBDIR%%/language/index.htm
 %%PHPBBDIR%%/login.php
 %%PHPBBDIR%%/memberlist.php
 %%PHPBBDIR%%/modcp.php
@@ -144,169 +144,169 @@ share/phpbb/upgrade.php
 %%PHPBBDIR%%/privmsg.php
 %%PHPBBDIR%%/profile.php
 %%PHPBBDIR%%/search.php
-%%PHPBBDIR%%/templates/subSilver/viewtopic_body.tpl
-%%PHPBBDIR%%/templates/subSilver/simple_header.tpl
-%%PHPBBDIR%%/templates/subSilver/viewtopic_poll_result.tpl
-%%PHPBBDIR%%/templates/subSilver/posting_topic_review.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/smile_list_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/forum_prune_result_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/styles_list_body.tpl
+%%PHPBBDIR%%/templates/index.htm
+%%PHPBBDIR%%/templates/subSilver/admin/admin_message_body.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/auth_forum_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/user_email_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/group_edit_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/auth_select_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/auth_ug_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/board_config_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/category_edit_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/db_utils_backup_body.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/db_utils_restore_body.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/disallow_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/page_footer.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/user_select_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/forum_admin_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/forum_delete_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/forum_edit_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/forum_prune_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/forum_prune_result_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/forum_prune_select_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/group_edit_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/group_select_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/index.htm
+%%PHPBBDIR%%/templates/subSilver/admin/index_body.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/index_frameset.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/index_navigate.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/page_footer.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/page_header.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/words_list_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/styles_exporter.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/category_edit_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/ranks_edit_body.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/ranks_list_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/index.htm
 %%PHPBBDIR%%/templates/subSilver/admin/smile_edit_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/auth_select_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/admin_message_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/styles_edit_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/board_config_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/index_navigate.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/forum_edit_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/group_select_body.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/smile_import_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/forum_prune_select_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/user_edit_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/index_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/forum_admin_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/user_ban_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/words_edit_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/smile_list_body.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/styles_addnew_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/ranks_edit_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/forum_delete_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/forum_prune_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/styles_edit_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/styles_exporter.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/styles_list_body.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/user_avatar_gallery.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/auth_ug_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/db_utils_backup_body.tpl
-%%PHPBBDIR%%/templates/subSilver/groupcp_pending_info.tpl
-%%PHPBBDIR%%/templates/subSilver/viewtopic_poll_ballot.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/user_ban_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/user_edit_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/user_email_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/user_select_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/words_edit_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/words_list_body.tpl
+%%PHPBBDIR%%/templates/subSilver/agreement.tpl
+%%PHPBBDIR%%/templates/subSilver/bbcode.tpl
+%%PHPBBDIR%%/templates/subSilver/confirm_body.tpl
+%%PHPBBDIR%%/templates/subSilver/error_body.tpl
+%%PHPBBDIR%%/templates/subSilver/faq_body.tpl
 %%PHPBBDIR%%/templates/subSilver/formIE.css
-%%PHPBBDIR%%/templates/subSilver/viewforum_body.tpl
-%%PHPBBDIR%%/templates/subSilver/modcp_move.tpl
-%%PHPBBDIR%%/templates/subSilver/viewonline_body.tpl
-%%PHPBBDIR%%/templates/subSilver/groupcp_user_body.tpl
-%%PHPBBDIR%%/templates/subSilver/search_username.tpl
 %%PHPBBDIR%%/templates/subSilver/groupcp_info_body.tpl
-%%PHPBBDIR%%/templates/subSilver/theme_info.cfg
-%%PHPBBDIR%%/templates/subSilver/bbcode.tpl
-%%PHPBBDIR%%/templates/subSilver/modcp_body.tpl
-%%PHPBBDIR%%/templates/subSilver/overall_footer.tpl
-%%PHPBBDIR%%/templates/subSilver/images/folder_sticky.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_new.gif
+%%PHPBBDIR%%/templates/subSilver/groupcp_pending_info.tpl
+%%PHPBBDIR%%/templates/subSilver/groupcp_user_body.tpl
+%%PHPBBDIR%%/templates/subSilver/images/cellpic.gif
 %%PHPBBDIR%%/templates/subSilver/images/cellpic1.gif
 %%PHPBBDIR%%/templates/subSilver/images/cellpic2.jpg
 %%PHPBBDIR%%/templates/subSilver/images/cellpic3.gif
+%%PHPBBDIR%%/templates/subSilver/images/created_by.jpg
+%%PHPBBDIR%%/templates/subSilver/images/folder.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_announce.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_announce_new.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_big.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_hot.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_lock.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_lock_new.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_locked_big.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_new.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_new_big.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_new_hot.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_sticky.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_sticky_new.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_delete.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_latest_reply.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_mini_faq.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_mini_groups.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_mini_login.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_mini_members.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_mini_message.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_mini_profile.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_mini_register.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_mini_search.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_minipost.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_minipost_new.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_newest_reply.gif
+%%PHPBBDIR%%/templates/subSilver/images/index.htm
+%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_aim.gif
+%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_edit.gif
+%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_email.gif
+%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_icq_add.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_ip.gif
+%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_msnm.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_pm.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_icq_add.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_www.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_english/reply.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_profile.gif
+%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_quote.gif
+%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_search.gif
+%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_www.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_yim.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_english/post.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_english/msg_newpost.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_quote.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_email.gif
+%%PHPBBDIR%%/templates/subSilver/images/lang_english/post.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_english/reply-locked.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_edit.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_search.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_msnm.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_aim.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_minipost.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_mini_members.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_mini_search.gif
-%%PHPBBDIR%%/templates/subSilver/images/topic_move.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_mini_message.gif
-%%PHPBBDIR%%/templates/subSilver/images/vote_rcap.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_mini_faq.gif
-%%PHPBBDIR%%/templates/subSilver/images/msg_sentbox.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_latest_reply.gif
+%%PHPBBDIR%%/templates/subSilver/images/lang_english/reply.gif
+%%PHPBBDIR%%/templates/subSilver/images/logo_phpBB.gif
 %%PHPBBDIR%%/templates/subSilver/images/logo_phpBB_med.gif
 %%PHPBBDIR%%/templates/subSilver/images/msg_inbox.gif
-%%PHPBBDIR%%/templates/subSilver/images/topic_unlock.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_locked_big.gif
-%%PHPBBDIR%%/templates/subSilver/images/topic_lock.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_minipost_new.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_hot.gif
-%%PHPBBDIR%%/templates/subSilver/images/whosonline.gif
 %%PHPBBDIR%%/templates/subSilver/images/msg_outbox.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_big.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_sticky_new.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_new_hot.gif
-%%PHPBBDIR%%/templates/subSilver/images/vote_lcap.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_new_big.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_lock_new.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_mini_profile.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_mini_groups.gif
-%%PHPBBDIR%%/templates/subSilver/images/index.htm
-%%PHPBBDIR%%/templates/subSilver/images/logo_phpBB.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_newest_reply.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder.gif
-%%PHPBBDIR%%/templates/subSilver/images/cellpic.gif
+%%PHPBBDIR%%/templates/subSilver/images/msg_savebox.gif
+%%PHPBBDIR%%/templates/subSilver/images/msg_sentbox.gif
+%%PHPBBDIR%%/templates/subSilver/images/spacer.gif
 %%PHPBBDIR%%/templates/subSilver/images/topic_delete.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_mini_login.gif
-%%PHPBBDIR%%/templates/subSilver/images/created_by.jpg
-%%PHPBBDIR%%/templates/subSilver/images/folder_announce_new.gif
+%%PHPBBDIR%%/templates/subSilver/images/topic_lock.gif
+%%PHPBBDIR%%/templates/subSilver/images/topic_move.gif
 %%PHPBBDIR%%/templates/subSilver/images/topic_split.gif
-%%PHPBBDIR%%/templates/subSilver/images/msg_savebox.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_announce.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_delete.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_mini_register.gif
+%%PHPBBDIR%%/templates/subSilver/images/topic_unlock.gif
+%%PHPBBDIR%%/templates/subSilver/images/vote_lcap.gif
+%%PHPBBDIR%%/templates/subSilver/images/vote_rcap.gif
 %%PHPBBDIR%%/templates/subSilver/images/voting_bar.gif
-%%PHPBBDIR%%/templates/subSilver/images/spacer.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_lock.gif
-%%PHPBBDIR%%/templates/subSilver/profile_view_body.tpl
-%%PHPBBDIR%%/templates/subSilver/memberlist_body.tpl
-%%PHPBBDIR%%/templates/subSilver/agreement.tpl
-%%PHPBBDIR%%/templates/subSilver/search_results_posts.tpl
-%%PHPBBDIR%%/templates/subSilver/privmsgs_preview.tpl
-%%PHPBBDIR%%/templates/subSilver/error_body.tpl
+%%PHPBBDIR%%/templates/subSilver/images/whosonline.gif
 %%PHPBBDIR%%/templates/subSilver/index.htm
+%%PHPBBDIR%%/templates/subSilver/index_body.tpl
+%%PHPBBDIR%%/templates/subSilver/jumpbox.tpl
+%%PHPBBDIR%%/templates/subSilver/login_body.tpl
+%%PHPBBDIR%%/templates/subSilver/memberlist_body.tpl
 %%PHPBBDIR%%/templates/subSilver/message_body.tpl
-%%PHPBBDIR%%/templates/subSilver/posting_preview.tpl
+%%PHPBBDIR%%/templates/subSilver/modcp_body.tpl
+%%PHPBBDIR%%/templates/subSilver/modcp_move.tpl
+%%PHPBBDIR%%/templates/subSilver/modcp_split.tpl
+%%PHPBBDIR%%/templates/subSilver/modcp_viewip.tpl
+%%PHPBBDIR%%/templates/subSilver/overall_footer.tpl
 %%PHPBBDIR%%/templates/subSilver/overall_header.tpl
-%%PHPBBDIR%%/templates/subSilver/search_results_topics.tpl
 %%PHPBBDIR%%/templates/subSilver/posting_body.tpl
+%%PHPBBDIR%%/templates/subSilver/posting_poll_body.tpl
+%%PHPBBDIR%%/templates/subSilver/posting_preview.tpl
+%%PHPBBDIR%%/templates/subSilver/posting_smilies.tpl
+%%PHPBBDIR%%/templates/subSilver/posting_topic_review.tpl
 %%PHPBBDIR%%/templates/subSilver/privmsgs_body.tpl
+%%PHPBBDIR%%/templates/subSilver/privmsgs_popup.tpl
+%%PHPBBDIR%%/templates/subSilver/privmsgs_preview.tpl
+%%PHPBBDIR%%/templates/subSilver/privmsgs_read_body.tpl
 %%PHPBBDIR%%/templates/subSilver/profile_add_body.tpl
-%%PHPBBDIR%%/templates/subSilver/posting_smilies.tpl
-%%PHPBBDIR%%/templates/subSilver/search_body.tpl
-%%PHPBBDIR%%/templates/subSilver/index_body.tpl
+%%PHPBBDIR%%/templates/subSilver/profile_avatar_gallery.tpl
 %%PHPBBDIR%%/templates/subSilver/profile_send_email.tpl
-%%PHPBBDIR%%/templates/subSilver/privmsgs_popup.tpl
-%%PHPBBDIR%%/templates/subSilver/modcp_split.tpl
-%%PHPBBDIR%%/templates/subSilver/posting_poll_body.tpl
-%%PHPBBDIR%%/templates/subSilver/subSilver.cfg
-%%PHPBBDIR%%/templates/subSilver/subSilver.css
 %%PHPBBDIR%%/templates/subSilver/profile_send_pass.tpl
-%%PHPBBDIR%%/templates/subSilver/faq_body.tpl
-%%PHPBBDIR%%/templates/subSilver/privmsgs_read_body.tpl
-%%PHPBBDIR%%/templates/subSilver/confirm_body.tpl
-%%PHPBBDIR%%/templates/subSilver/modcp_viewip.tpl
+%%PHPBBDIR%%/templates/subSilver/profile_view_body.tpl
+%%PHPBBDIR%%/templates/subSilver/search_body.tpl
+%%PHPBBDIR%%/templates/subSilver/search_results_posts.tpl
+%%PHPBBDIR%%/templates/subSilver/search_results_topics.tpl
+%%PHPBBDIR%%/templates/subSilver/search_username.tpl
 %%PHPBBDIR%%/templates/subSilver/simple_footer.tpl
-%%PHPBBDIR%%/templates/subSilver/login_body.tpl
-%%PHPBBDIR%%/templates/subSilver/jumpbox.tpl
-%%PHPBBDIR%%/templates/subSilver/profile_avatar_gallery.tpl
-%%PHPBBDIR%%/templates/index.htm
+%%PHPBBDIR%%/templates/subSilver/simple_header.tpl
+%%PHPBBDIR%%/templates/subSilver/subSilver.cfg
+%%PHPBBDIR%%/templates/subSilver/subSilver.css
+%%PHPBBDIR%%/templates/subSilver/theme_info.cfg
+%%PHPBBDIR%%/templates/subSilver/viewforum_body.tpl
+%%PHPBBDIR%%/templates/subSilver/viewonline_body.tpl
+%%PHPBBDIR%%/templates/subSilver/viewtopic_body.tpl
+%%PHPBBDIR%%/templates/subSilver/viewtopic_poll_ballot.tpl
+%%PHPBBDIR%%/templates/subSilver/viewtopic_poll_result.tpl
 %%PHPBBDIR%%/viewforum.php
 %%PHPBBDIR%%/viewonline.php
 %%PHPBBDIR%%/viewtopic.php
 @exec touch %B/config.php
 @exec chown -R %%WWWOWN%%:%%WWWGRP%% %B
 @dirrm share/doc/phpbb
-@unexec rmdir share/doc 2>/dev/null || true
+@unexec rmdir %D/share/doc 2>/dev/null || true
 @dirrm share/phpbb/contrib
 @dirrm share/phpbb
-@unexec rmdir share 2>/dev/null || true
+@unexec rmdir %D/share 2>/dev/null || true
 @dirrm %%PHPBBDIR%%/admin
 @dirrm %%PHPBBDIR%%/cache
 @dirrm %%PHPBBDIR%%/db