diff --git a/.travis.yml b/.travis.yml index 0ddd98b5d8..f296f10230 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ before_script: - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi" - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi" - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi" + - pyrus set auto_discover 1 - pyrus install --force phpunit/DbUnit - phpenv rehash - cd phpBB diff --git a/README.md b/README.md index 1fc670422f..78aa306bed 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![phpBB](http://www.phpbb.com/theme/images/logos/blue/160x52.png)](http://www.phpbb.com) +[![phpBB](https://www.phpbb.com/theme/images/logos/blue/160x52.png)](http://www.phpbb.com) ## ABOUT @@ -13,7 +13,7 @@ Find support and lots more on [phpBB.com](http://www.phpbb.com)! Discuss the dev To be able to run an installation from the repo (and not from a pre-built package) you need to run the following commands to install phpBB's dependencies. cd phpBB - php ../composer.phar install + php ../composer.phar install --dev ## CONTRIBUTE diff --git a/build/build.xml b/build/build.xml index 1b8d42a660..28dd36bea8 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - + - + diff --git a/composer.phar b/composer.phar index 8b6eddbf21..af7b8c1a67 100755 Binary files a/composer.phar and b/composer.phar differ diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index bdec9eb3cb..266b7e48b4 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -54,7 +54,7 @@
-

{options.TITLE_EXPLAIN}
+

{options.TITLE_EXPLAIN}
{options.CONTENT}
@@ -78,11 +78,11 @@ {L_SECURE_TITLE}

{L_DOWNLOAD_ADD_IPS_EXPLAIN}

-
+
-

{L_EXCLUDE_ENTERED_IP}
+

{L_EXCLUDE_ENTERED_IP}
@@ -97,7 +97,7 @@

{L_DOWNLOAD_REMOVE_IPS_EXPLAIN}

-
+
@@ -172,39 +172,39 @@ {L_LEGEND}
-
+
-

{L_SPECIAL_CATEGORY_EXPLAIN}
+

{L_SPECIAL_CATEGORY_EXPLAIN}
{S_CATEGORY_SELECT}
-
+
checked="checked" />
-
+
checked="checked" />
-
+
 src="{PHPBB_ROOT_PATH}images/spacer.gif"src="{UPLOAD_ICON_SRC}" id="image_upload_icon" alt="" title="" /> 
-
+
-
+
{ASSIGNED_EXTENSIONS}
[{L_GO_TO_EXTENSIONS} ]
-

{L_ALLOWED_FORUMS_EXPLAIN}
+

{L_ALLOWED_FORUMS_EXPLAIN}
@@ -254,7 +254,7 @@

- {L_CREATE_GROUP}: + {L_CREATE_GROUP}{L_COLON}

{S_FORM_TOKEN} @@ -348,7 +348,7 @@ {orphan.REAL_FILENAME} {orphan.FILETIME} {orphan.FILESIZE} - {L_ATTACH_ID}: + {L_ATTACH_ID}{L_COLON} @@ -380,12 +380,11 @@ @@ -403,8 +402,8 @@ - {L_EXTENSION_GROUP}: {attachments.EXT_GROUP_NAME}{L_NO_EXT_GROUP}
{attachments.L_DOWNLOAD_COUNT}
{L_IN} {L_PRIVATE_MESSAGE} - {attachments.REAL_FILENAME}
{attachments.COMMENT}
{attachments.L_DOWNLOAD_COUNT}
{L_TOPIC}: {attachments.TOPIC_TITLE} + {L_EXTENSION_GROUP}{L_COLON} {attachments.EXT_GROUP_NAME}{L_NO_EXT_GROUP}
{attachments.L_DOWNLOAD_COUNT}
{L_IN} {L_PRIVATE_MESSAGE} + {attachments.REAL_FILENAME}
{attachments.COMMENT}
{attachments.L_DOWNLOAD_COUNT}
{L_TOPIC}{L_COLON} {attachments.TOPIC_TITLE} {attachments.FILETIME}
{L_POST_BY_AUTHOR} {attachments.ATTACHMENT_POSTER} {attachments.FILESIZE} @@ -420,14 +419,19 @@
- {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} + {L_DISPLAY_LOG}{L_COLON}  {S_LIMIT_DAYS} {L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}
diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html index d564e89312..71c737de70 100644 --- a/phpBB/adm/style/acp_ban.html +++ b/phpBB/adm/style/acp_ban.html @@ -44,26 +44,26 @@
{L_TITLE}
-
+
[ {L_FIND_USERNAME} ]
-
+
-

{L_BAN_EXCLUDE_EXPLAIN}
+

{L_BAN_EXCLUDE_EXPLAIN}
-
+
-
+
@@ -88,19 +88,19 @@
-
+
-
+
-
+
-
+
diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html index 781f5c6bce..6b8ceb3ef6 100644 --- a/phpBB/adm/style/acp_board.html +++ b/phpBB/adm/style/acp_board.html @@ -25,7 +25,7 @@
-

{options.TITLE_EXPLAIN}
+

{options.TITLE_EXPLAIN}
{options.CONTENT}
diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html index 87679fc33a..cdd0fd4a93 100644 --- a/phpBB/adm/style/acp_bots.html +++ b/phpBB/adm/style/acp_bots.html @@ -22,27 +22,27 @@
{L_TITLE}
-

{L_BOT_NAME_EXPLAIN}
+

{L_BOT_NAME_EXPLAIN}
-

{L_BOT_STYLE_EXPLAIN}
+

{L_BOT_STYLE_EXPLAIN}
-

{L_BOT_LANG_EXPLAIN}
+

{L_BOT_LANG_EXPLAIN}
-
+
-

{L_BOT_AGENT_EXPLAIN}
+

{L_BOT_AGENT_EXPLAIN}
-

{L_BOT_IP_EXPLAIN}
+

{L_BOT_IP_EXPLAIN}
diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index 83314ab633..ab5e207e0d 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -13,25 +13,25 @@ {L_GENERAL_OPTIONS}
-

{L_VISUAL_CONFIRM_REG_EXPLAIN}
+

{L_VISUAL_CONFIRM_REG_EXPLAIN}
-

{L_REG_LIMIT_EXPLAIN}
+

{L_REG_LIMIT_EXPLAIN}
-

{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}
+

{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}
-

{L_VISUAL_CONFIRM_POST_EXPLAIN}
+

{L_VISUAL_CONFIRM_POST_EXPLAIN}
-

{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}
+

{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}
@@ -40,12 +40,12 @@
{L_AVAILABLE_CAPTCHAS}
-

{L_CAPTCHA_SELECT_EXPLAIN}
+

{L_CAPTCHA_SELECT_EXPLAIN}
-

{L_CAPTCHA_CONFIGURE_EXPLAIN}
+

{L_CAPTCHA_CONFIGURE_EXPLAIN}
diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index 28ac2db1b9..bf0c80bcd9 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -13,7 +13,7 @@
{L_RESTORE_OPTIONS}
-
+
@@ -57,26 +57,26 @@
{L_BACKUP_OPTIONS}
-
+
-
+
-
+
-
+
@@ -28,7 +28,7 @@ {L_DELETE_DISALLOW_TITLE}
-
+
diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html index 1339ac6529..950ecb40b0 100644 --- a/phpBB/adm/style/acp_email.html +++ b/phpBB/adm/style/acp_email.html @@ -18,32 +18,32 @@
{L_COMPOSE}
-
+
-

{L_SEND_TO_USERS_EXPLAIN}
+

{L_SEND_TO_USERS_EXPLAIN}
[ {L_FIND_USERNAME} ]
-
+
-

{L_MASS_MESSAGE_EXPLAIN}
+

{L_MASS_MESSAGE_EXPLAIN}
-
+
-

{L_MAIL_BANNED_EXPLAIN}
+

{L_MAIL_BANNED_EXPLAIN}
-
+
diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html new file mode 100644 index 0000000000..18786d80f9 --- /dev/null +++ b/phpBB/adm/style/acp_ext_details.html @@ -0,0 +1,97 @@ + + + + + « {L_BACK} + +

{L_EXTENSIONS_ADMIN}

+ +
+ {L_EXT_DETAILS} + +
+
+
{META_DISPLAY_NAME}
+
+ +
+
+
{META_NAME}
+
+ +
+
+

{META_DESCRIPTION}

+
+ +
+
+

{META_VERSION}

+
+ +
+
+

{META_HOMEPAGE}

+
+ + +
+
+

{META_TIME}

+
+ +
+
+

{META_LICENCE}

+
+
+ + +
+ {L_REQUIREMENTS} + + class="requirements_not_met"> +
+

{META_REQUIRE_PHPBB}

+
+ + + class="requirements_not_met"> +
+

{META_REQUIRE_PHP}

+ + + + + +
+ {L_AUTHOR_INFORMATION} + +
+
+
+
{meta_authors.AUTHOR_NAME}
+
+ +
+
+
{meta_authors.AUTHOR_EMAIL}
+
+ + +
+
+
{meta_authors.AUTHOR_HOMEPAGE}
+
+ + +
+
+
{meta_authors.AUTHOR_ROLE}
+
+ +
+ +
+ + diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html new file mode 100644 index 0000000000..7dc3f6ec97 --- /dev/null +++ b/phpBB/adm/style/acp_ext_disable.html @@ -0,0 +1,34 @@ + + + + +

{L_EXTENSIONS_ADMIN}

+ +

{L_EXTENSIONS_EXPLAIN}

+

{L_DISABLE_EXPLAIN}

+ + +
+

{L_DISABLE_CONFIRM}

+
+ +
+
+ {L_DISABLE} + + +
+
+ +
+

{L_DISABLE_IN_PROGRESS}

+
+ +
+

{L_DISABLE_SUCCESS}

+
+

{L_RETURN}

+
+ + + diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html new file mode 100644 index 0000000000..3f7be2c847 --- /dev/null +++ b/phpBB/adm/style/acp_ext_enable.html @@ -0,0 +1,34 @@ + + + + +

{L_EXTENSIONS_ADMIN}

+ +

{L_EXTENSIONS_EXPLAIN}

+

{L_ENABLE_EXPLAIN}

+ + +
+

{L_ENABLE_CONFIRM}

+
+ +
+
+ {L_ENABLE} + + +
+
+ +
+

{L_ENABLE_IN_PROGRESS}

+
+ +
+

{L_ENABLE_SUCCESS}

+
+

{L_RETURN}

+
+ + + diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html new file mode 100644 index 0000000000..53de0b4d12 --- /dev/null +++ b/phpBB/adm/style/acp_ext_list.html @@ -0,0 +1,61 @@ + + + + +

{L_EXTENSIONS_ADMIN}

+ +

{L_EXTENSIONS_EXPLAIN}

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_EXTENSION_NAME}{L_EXTENSION_OPTIONS}{L_EXTENSION_ACTIONS}
+ {L_ENABLED} {L_EXTENSIONS} +
{enabled.META_DISPLAY_NAME}{L_DETAILS} + + {enabled.actions.L_ACTION} +  |  + +
{L_DISABLED} {L_EXTENSIONS}
{disabled.META_DISPLAY_NAME} + {L_DETAILS} + + + {disabled.actions.L_ACTION} +  |  + +
+ + diff --git a/phpBB/adm/style/acp_ext_purge.html b/phpBB/adm/style/acp_ext_purge.html new file mode 100644 index 0000000000..00a58721cb --- /dev/null +++ b/phpBB/adm/style/acp_ext_purge.html @@ -0,0 +1,34 @@ + + + + +

{L_EXTENSIONS_ADMIN}

+ +

{L_EXTENSIONS_EXPLAIN}

+

{L_PURGE_EXPLAIN}

+ + +
+

{L_PURGE_CONFIRM}

+
+ +
+
+ {L_PURGE} + + +
+
+ +
+

{L_PURGE_IN_PROGRESS}

+
+ +
+

{L_PURGE_SUCCESS}

+
+

{L_RETURN}

+
+ + + diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 048a24a328..cb9cae6c0d 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -112,13 +112,13 @@
{L_FORUM_SETTINGS}
-
+
-
+
@@ -127,7 +127,7 @@
-
+
-

{L_COPY_PERMISSIONS_EXPLAIN}
+

{L_COPY_PERMISSIONS_EXPLAIN}
-
+
-

{L_FORUM_DESC_EXPLAIN}
+

{L_FORUM_DESC_EXPLAIN}
-

{L_FORUM_IMAGE_EXPLAIN}
+

{L_FORUM_IMAGE_EXPLAIN}
{L_FORUM_IMAGE}
-

{L_FORUM_PASSWORD_EXPLAIN}
+

{L_FORUM_PASSWORD_EXPLAIN}
-

{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}
+

{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}
-

{L_FORUM_PASSWORD_UNSET_EXPLAIN}
+

{L_FORUM_PASSWORD_UNSET_EXPLAIN}
-
+
@@ -188,7 +188,7 @@
{L_GENERAL_FORUM_SETTINGS}
-

{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}
+

{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}
@@ -199,46 +199,46 @@
{L_GENERAL_FORUM_SETTINGS}
-
+
-

{L_LIST_SUBFORUMS_EXPLAIN}
+

{L_LIST_SUBFORUMS_EXPLAIN}
-

{L_LIST_INDEX_EXPLAIN}
+

{L_LIST_INDEX_EXPLAIN}
-

{L_ENABLE_POST_REVIEW_EXPLAIN}
+

{L_ENABLE_POST_REVIEW_EXPLAIN}
-

{L_ENABLE_QUICK_REPLY_EXPLAIN}
+

{L_ENABLE_QUICK_REPLY_EXPLAIN}
-

{L_ENABLE_INDEXING_EXPLAIN}
+

{L_ENABLE_INDEXING_EXPLAIN}
-
+
-

{L_ENABLE_RECENT_EXPLAIN}
+

{L_ENABLE_RECENT_EXPLAIN}
-

{L_FORUM_TOPICS_PAGE_EXPLAIN}
+

{L_FORUM_TOPICS_PAGE_EXPLAIN}
@@ -246,34 +246,34 @@
{L_FORUM_PRUNE_SETTINGS}
-

{L_FORUM_AUTO_PRUNE_EXPLAIN}
+

{L_FORUM_AUTO_PRUNE_EXPLAIN}
-

{L_AUTO_PRUNE_FREQ_EXPLAIN}
+

{L_AUTO_PRUNE_FREQ_EXPLAIN}
{L_DAYS}
-

{L_AUTO_PRUNE_DAYS_EXPLAIN}
+

{L_AUTO_PRUNE_DAYS_EXPLAIN}
{L_DAYS}
-

{L_AUTO_PRUNE_VIEWED_EXPLAIN}
+

{L_AUTO_PRUNE_VIEWED_EXPLAIN}
{L_DAYS}
-

{L_PRUNE_OLD_POLLS_EXPLAIN}
+

{L_PRUNE_OLD_POLLS_EXPLAIN}
-
+
-
+
@@ -284,16 +284,16 @@
{L_GENERAL_FORUM_SETTINGS}
-

{L_LIST_INDEX_EXPLAIN}
+

{L_LIST_INDEX_EXPLAIN}
-

{L_FORUM_LINK_EXPLAIN}
+

{L_FORUM_LINK_EXPLAIN}
-

{L_FORUM_LINK_TRACK_EXPLAIN}
+

{L_FORUM_LINK_TRACK_EXPLAIN}
@@ -304,17 +304,17 @@
{L_FORUM_RULES}
-

{L_FORUM_RULES_LINK_EXPLAIN}
+

{L_FORUM_RULES_LINK_EXPLAIN}
-
+
{FORUM_RULES_PREVIEW}
-

{L_FORUM_RULES_EXPLAIN}
+

{L_FORUM_RULES_EXPLAIN}
@@ -351,12 +351,12 @@
{L_FORUM_DELETE}
-
+
{FORUM_NAME}
-
+
@@ -365,7 +365,7 @@
-
+
@@ -449,17 +449,17 @@
{forums.FORUM_IMAGE}
{forums.FORUM_NAME}{forums.FORUM_NAME}
{forums.FORUM_DESCRIPTION} -

{L_TOPICS}: {forums.FORUM_TOPICS} / {L_POSTS}: {forums.FORUM_POSTS} +

{L_TOPICS}{L_COLON} {forums.FORUM_TOPICS} / {L_POSTS}{L_COLON} {forums.FORUM_POSTS} {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN} + {ICON_MOVE_DOWN} - {ICON_MOVE_UP} - {ICON_MOVE_DOWN} + {ICON_MOVE_UP} + {ICON_MOVE_DOWN} - {ICON_MOVE_UP} + {ICON_MOVE_UP} {ICON_MOVE_DOWN_DISABLED} {ICON_MOVE_UP_DISABLED} @@ -482,7 +482,7 @@
- {L_SELECT_FORUM}: + {L_SELECT_FORUM}{L_COLON} {S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_forums_copy_perm.html b/phpBB/adm/style/acp_forums_copy_perm.html index acec3c1967..1fcf2f62a4 100644 --- a/phpBB/adm/style/acp_forums_copy_perm.html +++ b/phpBB/adm/style/acp_forums_copy_perm.html @@ -9,7 +9,7 @@
-

{L_COPY_PERMISSIONS_EXPLAIN}
+

{L_COPY_PERMISSIONS_EXPLAIN}
{S_FORM_TOKEN}{S_HIDDEN_FIELDS} diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 6e52880131..4701bf702f 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -22,11 +22,11 @@
{L_GROUP_DETAILS}
-
for="group_name">{L_GROUP_NAME}:
+
for="group_name">{L_GROUP_NAME}{L_COLON}
{GROUP_NAME}
-
+
@@ -34,7 +34,7 @@
-

{L_GROUP_TYPE_EXPLAIN}
+

{L_GROUP_TYPE_EXPLAIN}
@@ -48,7 +48,7 @@
-

{L_COPY_PERMISSIONS_EXPLAIN}
+

{L_COPY_PERMISSIONS_EXPLAIN}
@@ -58,24 +58,24 @@ {L_GROUP_OPTIONS_SAVE}
-

{L_GROUP_FOUNDER_MANAGE_EXPLAIN}
+

{L_GROUP_FOUNDER_MANAGE_EXPLAIN}
-

{L_GROUP_SKIP_AUTH_EXPLAIN}
+

{L_GROUP_SKIP_AUTH_EXPLAIN}
-
+
-
+
-

{L_GROUP_RECEIVE_PM_EXPLAIN}
+

{L_GROUP_RECEIVE_PM_EXPLAIN}
@@ -83,19 +83,19 @@
{L_GROUP_SETTINGS_SAVE}
-

{L_GROUP_MESSAGE_LIMIT_EXPLAIN}
+

{L_GROUP_MESSAGE_LIMIT_EXPLAIN}
-

{L_GROUP_MAX_RECIPIENTS_EXPLAIN}
+

{L_GROUP_MAX_RECIPIENTS_EXPLAIN}
-

{L_GROUP_COLOR_EXPLAIN}
+

{L_GROUP_COLOR_EXPLAIN}
      [ {L_COLOUR_SWATCH} ]
-
+
@@ -103,32 +103,32 @@
{L_GROUP_AVATAR}
-

{L_AVATAR_EXPLAIN}
+

{L_AVATAR_EXPLAIN}
{AVATAR_IMAGE}
-
+
-

{L_UPLOAD_AVATAR_URL_EXPLAIN}
+

{L_UPLOAD_AVATAR_URL_EXPLAIN}
-

{L_LINK_REMOTE_AVATAR_EXPLAIN}
+

{L_LINK_REMOTE_AVATAR_EXPLAIN}
-

{L_LINK_REMOTE_SIZE_EXPLAIN}
+

{L_LINK_REMOTE_SIZE_EXPLAIN}
{L_PIXEL} × {L_PIXEL}
-
+
@@ -138,7 +138,7 @@
{L_AVATAR_GALLERY}
-
+
 
@@ -258,17 +258,17 @@
{L_ADD_USERS}
-
+
-

{L_USER_GROUP_DEFAULT_EXPLAIN}
+

{L_USER_GROUP_DEFAULT_EXPLAIN}
-

{L_USERNAMES_EXPLAIN}
+

{L_USERNAMES_EXPLAIN}
[ {L_FIND_USERNAME} ]
@@ -322,7 +322,7 @@
- {L_CREATE_GROUP}: + {L_CREATE_GROUP}{L_COLON} {S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html index 3a03573756..1e309d4cbc 100644 --- a/phpBB/adm/style/acp_groups_position.html +++ b/phpBB/adm/style/acp_groups_position.html @@ -9,7 +9,7 @@
{L_LEGEND_SETTINGS}
-

{L_LEGEND_SORT_GROUPNAME_EXPLAIN}
+

{L_LEGEND_SORT_GROUPNAME_EXPLAIN}
@@ -82,7 +82,7 @@
{L_TEAMPAGE_SETTINGS}
-
+


@@ -90,7 +90,7 @@
-

{L_TEAMPAGE_FORUMS_EXPLAIN}
+

{L_TEAMPAGE_FORUMS_EXPLAIN}
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html index ad5871f291..726c8c8b32 100644 --- a/phpBB/adm/style/acp_inactive.html +++ b/phpBB/adm/style/acp_inactive.html @@ -10,11 +10,11 @@
-