diff --git a/phpBB/adm/images/icon_folder.gif b/phpBB/adm/images/icon_folder.gif index 9b2bc47c67..82ceee0784 100644 Binary files a/phpBB/adm/images/icon_folder.gif and b/phpBB/adm/images/icon_folder.gif differ diff --git a/phpBB/adm/images/icon_folder_link.gif b/phpBB/adm/images/icon_folder_link.gif index d5e86d47d7..01fb1c4e1e 100644 Binary files a/phpBB/adm/images/icon_folder_link.gif and b/phpBB/adm/images/icon_folder_link.gif differ diff --git a/phpBB/adm/images/icon_folder_link_small.gif b/phpBB/adm/images/icon_folder_link_small.gif deleted file mode 100644 index babe1e03cf..0000000000 Binary files a/phpBB/adm/images/icon_folder_link_small.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_folder_lock.gif b/phpBB/adm/images/icon_folder_lock.gif index 436f3d21c8..450bf28c3c 100644 Binary files a/phpBB/adm/images/icon_folder_lock.gif and b/phpBB/adm/images/icon_folder_lock.gif differ diff --git a/phpBB/adm/images/icon_folder_lock_small.gif b/phpBB/adm/images/icon_folder_lock_small.gif deleted file mode 100644 index 10eb776972..0000000000 Binary files a/phpBB/adm/images/icon_folder_lock_small.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_folder_small.gif b/phpBB/adm/images/icon_folder_small.gif deleted file mode 100644 index c16bfa75d5..0000000000 Binary files a/phpBB/adm/images/icon_folder_small.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_folder_sub_small.gif b/phpBB/adm/images/icon_folder_sub_small.gif deleted file mode 100644 index 355ee9c708..0000000000 Binary files a/phpBB/adm/images/icon_folder_sub_small.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_subfolder.gif b/phpBB/adm/images/icon_subfolder.gif index 9179303e7f..5e97bc94ce 100644 Binary files a/phpBB/adm/images/icon_subfolder.gif and b/phpBB/adm/images/icon_subfolder.gif differ diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 839ab9a27c..1a769eaf68 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -413,7 +413,7 @@ - {forums.FOLDER_IMAGE} + {forums.FOLDER_IMAGE}
{forums.FORUM_IMAGE}
{forums.FORUM_NAME}{forums.FORUM_NAME} diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index ecc8fe4c61..3f09fcae94 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -147,7 +147,7 @@ - {modules.MODULE_IMAGE} + {modules.MODULE_IMAGE} {modules.MODULE_TITLE} [{L_HIDDEN_MODULE}]  {L_DISABLE}{L_ENABLE}  diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index ae4134e95b..9fe61e6c2d 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -218,7 +218,7 @@ -
+
 
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html index 471c465807..81f889b390 100644 --- a/phpBB/adm/style/permission_mask.html +++ b/phpBB/adm/style/permission_mask.html @@ -28,8 +28,7 @@ - - {p_mask.f_mask.NAME} + {p_mask.f_mask.NAME}
diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php index 10f5633f1e..ce6a08bf0b 100644 --- a/phpBB/includes/acp/auth.php +++ b/phpBB/includes/acp/auth.php @@ -556,35 +556,9 @@ class auth_admin extends auth $s_role_options = '' . $s_role_options; } - if (!$forum_id) - { - $folder_image = ''; - } - else - { - if ($forum_names_ary[$forum_id]['forum_status'] == ITEM_LOCKED) - { - $folder_image = '' . $user->lang['FORUM_LOCKED'] . ''; - } - else - { - switch ($forum_names_ary[$forum_id]['forum_type']) - { - case FORUM_LINK: - $folder_image = '' . $user->lang['FORUM_LINK'] . ''; - break; - - default: - $folder_image = ($forum_names_ary[$forum_id]['left_id'] + 1 != $forum_names_ary[$forum_id]['right_id']) ? '' . $user->lang['SUBFORUM'] . '' : '' . $user->lang['FOLDER'] . ''; - break; - } - } - } - $template->assign_block_vars($tpl_pmask . '.' . $tpl_fmask, array( 'NAME' => ($forum_id == 0) ? $forum_names_ary[0] : $forum_names_ary[$forum_id]['forum_name'], 'PADDING' => ($forum_id == 0) ? '' : $forum_names_ary[$forum_id]['padding'], - 'FOLDER_IMAGE' => $folder_image, 'S_ROLE_OPTIONS' => $s_role_options, 'UG_ID' => $ug_id, 'FORUM_ID' => $forum_id) diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index b646594631..3cf3f41225 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -651,7 +651,7 @@ function compose_pm($id, $mode, $action) $message_parser->decode_message($bbcode_uid); - if (($action == 'quote' || $action == 'quotepost') && !$preview && !$refresh) + if (($action == 'quote' || $action == 'quotepost') && !$preview && !$refresh && !$submit) { if ($action == 'quotepost') { diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php index 05cbb9625c..15537d4e09 100644 --- a/phpBB/language/en/acp/groups.php +++ b/phpBB/language/en/acp/groups.php @@ -102,14 +102,14 @@ $lang = array_merge($lang, array( 'NO_USERS' => 'You haven’t entered any users.', 'SPECIAL_GROUPS' => 'Predefined groups', - 'SPECIAL_GROUPS_EXPLAIN' => 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings. By clicking “Default” you can set the relevant group to the default for all its members.', + 'SPECIAL_GROUPS_EXPLAIN' => 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings.', 'TOTAL_MEMBERS' => 'Members', 'USERS_APPROVED' => 'Users approved successfully.', 'USER_DEFAULT' => 'User default', 'USER_DEF_GROUPS' => 'User defined groups', - 'USER_DEF_GROUPS_EXPLAIN' => 'These are groups created by you or another admin on this board. You can manage memberships as well as edit group properties or even delete the group. By clicking “Default” you can set the relevant group to the default for all its members.', + 'USER_DEF_GROUPS_EXPLAIN' => 'These are groups created by you or another admin on this board. You can manage memberships as well as edit group properties or even delete the group.', 'USER_GROUP_DEFAULT' => 'Set as default group', 'USER_GROUP_DEFAULT_EXPLAIN' => 'Saying yes here will set this group as the default group for the added users', 'USER_GROUP_LEADER' => 'Set as group leader', diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php index 7880910d7e..a1cea09db7 100644 --- a/phpBB/language/en/acp/permissions.php +++ b/phpBB/language/en/acp/permissions.php @@ -43,7 +43,7 @@ $lang = array_merge($lang, array(

Permission Roles

These are used to create different sets of permissions for the different permission types later being able to be assigned on a role-based basis. The default roles should cover the administration of bulletin boards large and small, though within each of the four divisions, you can add/edit/delete roles as you see fit.

-

Permission Mask

+

Permission Masks

These are used to view the effective permissions assigned to Users, Moderators (Local and Global), Administrators or Forums.


diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index ebdbeef35c..fe405eb3d0 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -32,6 +32,7 @@ if (empty($lang) || !is_array($lang)) $lang = array_merge($lang, array( 'ACTION' => 'Action', + 'ACTION_NOTE' => 'Action/Note', 'ADD_FEEDBACK' => 'Add feedback', 'ADD_FEEDBACK_EXPLAIN' => 'If you would like to add a report on this please fill out the following form. Only use plain text; HTML, BBCode, etc. are not permitted.', 'ADD_WARNING' => 'Add warning', @@ -100,7 +101,7 @@ $lang = array_merge($lang, array( 'LATEST_LOGS' => 'Latest 5 logged actions', 'LATEST_REPORTED' => 'Latest 5 reports', - 'LATEST_UNAPPROVED' => 'Latest 5 posts awaiting for approval', + 'LATEST_UNAPPROVED' => 'Latest 5 posts awaiting approval', 'LATEST_WARNING_TIME' => 'Latest warning issued', 'LATEST_WARNINGS' => 'Latest 5 warnings', 'LEAVE_SHADOW' => 'Leave shadow topic in place', @@ -278,7 +279,7 @@ $lang = array_merge($lang, array( 'SELECT_ACTION' => 'Select desired action', 'SELECT_FORUM_GLOBAL_ANNOUNCEMENT' => 'Please select the forum you wish this global announcement to be displayed.', 'SELECT_FORUM_GLOBAL_ANNOUNCEMENTS' => 'One or more of the selected topics are global announcements. Please select the forum you wish these to be displayed.', - 'SELECT_MERGE' => 'Select for merging', + 'SELECT_MERGE' => 'Select for merge', 'SELECT_TOPICS_FROM' => 'Select topics from', 'SELECT_TOPIC' => 'Select topic', 'SELECT_USER' => 'Select user', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 4d2a13f7d1..9834210feb 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -83,6 +83,7 @@ $lang = array_merge($lang, array( 'ATTACHMENT_DELETED' => 'Attachment successfully deleted.', 'AVATAR_CATEGORY' => 'Category', 'AVATAR_EXPLAIN' => 'Maximum dimensions; width %1$d pixels, height %2$d pixels, filesize %3$dkB.', + 'AVATAR_FEATURES_DISABLED' => 'The avatar functionality is currently disabled.', 'AVATAR_GALLERY' => 'Local gallery', 'AVATAR_GENERAL_UPLOAD_ERROR' => 'Could not upload avatar to %s', 'AVATAR_PAGE' => 'Page', @@ -229,7 +230,7 @@ $lang = array_merge($lang, array( 'LOGIN_REDIRECT' => 'You have been successfully logged in.', 'LOGOUT_REDIRECT' => 'You have been successfully logged out.', - 'MARK_IMPORTANT' => 'Mark as important', + 'MARK_IMPORTANT' => 'Mark/Unmark as important', 'MARKED_MESSAGE' => 'Marked message', 'MAX_FOLDER_REACHED' => 'Maximum number of allowed user defined folders reached', 'MESSAGE_BY_AUTHOR' => 'by', diff --git a/phpBB/report.php b/phpBB/report.php index a7bcf58cc9..d0584b9d63 100644 --- a/phpBB/report.php +++ b/phpBB/report.php @@ -26,8 +26,8 @@ $forum_id = request_var('f', 0); $post_id = request_var('p', 0); $reason_id = request_var('reason_id', 0); $report_text = utf8_normalize_nfc(request_var('report_text', '', true)); +$user_notify = ($user->data['is_registered']) ? request_var('notify', 0) : false; -$user_notify = (isset($_POST['notify']) && $user->data['is_registered']) ? true : false; $submit = (isset($_POST['submit'])) ? true : false; if (!$post_id) diff --git a/phpBB/styles/prosilver/template/attachment.html b/phpBB/styles/prosilver/template/attachment.html index 1bb23b8eac..de46720baf 100644 --- a/phpBB/styles/prosilver/template/attachment.html +++ b/phpBB/styles/prosilver/template/attachment.html @@ -7,25 +7,23 @@
{_file.DOWNLOAD_NAME}
-
{_file.COMMENT}
- - {_file.DOWNLOAD_NAME} - -

{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}

+
+
{_file.DOWNLOAD_NAME}
+
{_file.COMMENT}
+
{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}
+
{_file.UPLOAD_ICON} {_file.DOWNLOAD_NAME}
- -
{_file.COMMENT}
- +
{_file.COMMENT}
({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}
diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html index 7e34ee2702..1be69178dd 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_user.html +++ b/phpBB/styles/prosilver/template/mcp_notes_user.html @@ -62,7 +62,7 @@ {L_REPORT_BY} {L_IP} {L_TIME} - {L_ACTION} + {L_ACTION_NOTE} {L_MARK} diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html index 0db9af4bf4..07fa6069f6 100644 --- a/phpBB/styles/prosilver/template/memberlist_search.html +++ b/phpBB/styles/prosilver/template/memberlist_search.html @@ -89,6 +89,10 @@ function insert_single(user)
+
+
+
+
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index b6433a1f8a..a9408c3cab 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -17,7 +17,7 @@
{L_USERNAME}:
- {USERNAME} + {USERNAME} [ {L_USER_ADMIN} ] [ {L_USE_PERMISSIONS} ]
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html index 70f68f2c60..8babd7fc1b 100644 --- a/phpBB/styles/prosilver/template/ucp_avatar_options.html +++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html @@ -1,6 +1,9 @@
+ +

{L_AVATAR_FEATURES_DISABLED}

+

{ERROR}

diff --git a/phpBB/styles/subsilver2/template/ucp_pm_options.html b/phpBB/styles/subsilver2/template/ucp_pm_options.html index 7e2326c084..4802b06720 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_options.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_options.html @@ -76,8 +76,8 @@ - {rule.COUNT} - {rule.CHECK} + #{rule.COUNT} + {L_IF} {rule.CHECK} {rule.RULE} {rule.STRING} {rule.ACTION} -> {rule.FOLDER} diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html index 00a2e4f415..27e9118b96 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html @@ -16,6 +16,11 @@ + + + {L_AVATAR_FEATURES_DISABLED} + + {L_UPLOAD_AVATAR_FILE}: