diff options
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_permissions.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_reasons.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/posting.php | 5 | ||||
| -rw-r--r-- | phpBB/language/en/acp/users.php | 2 |
5 files changed, 12 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index 434ccb5b82..b146e09a91 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -322,7 +322,7 @@ class acp_permissions $sql_forum_id = ($permission_scope == 'global') ? 'AND a.forum_id = 0' : ((sizeof($forum_id)) ? 'AND a.forum_id IN (' . implode(', ', $forum_id) . ')' : 'AND a.forum_id <> 0'); $sql_permission_option = "AND o.auth_option LIKE '" . $db->sql_escape($permission_type) . "%'"; - $sql = 'SELECT DISTINCT u.user_id, u.username + $sql = 'SELECT DISTINCT u.username, u.user_regdate, u.user_id FROM (' . USERS_TABLE . ' u, ' . ACL_OPTIONS_TABLE . ' o, ' . ACL_USERS_TABLE . ' a) LEFT JOIN ' . ACL_ROLES_DATA_TABLE . " r ON (a.auth_role_id = r.role_id) WHERE (a.auth_option_id = o.auth_option_id OR r.auth_option_id = o.auth_option_id) @@ -341,7 +341,7 @@ class acp_permissions } $db->sql_freeresult($result); - $sql = 'SELECT DISTINCT g.group_id, g.group_name, g.group_type + $sql = 'SELECT DISTINCT g.group_type, g.group_name, g.group_id FROM (' . GROUPS_TABLE . ' g, ' . ACL_OPTIONS_TABLE . ' o, ' . ACL_GROUPS_TABLE . ' a) LEFT JOIN ' . ACL_ROLES_DATA_TABLE . " r ON (a.auth_role_id = r.role_id) WHERE (a.auth_option_id = o.auth_option_id OR r.auth_option_id = o.auth_option_id) diff --git a/phpBB/includes/acp/acp_reasons.php b/phpBB/includes/acp/acp_reasons.php index 631c9d992d..2e6f664946 100644 --- a/phpBB/includes/acp/acp_reasons.php +++ b/phpBB/includes/acp/acp_reasons.php @@ -184,6 +184,11 @@ class acp_reasons trigger_error($user->lang['NO_REASON'] . adm_back_link($this->u_action)); } + if ($reason_row['reason_title'] == 'other') + { + trigger_error($user->lang['NO_REMOVE_DEFAULT_REASON'] . adm_back_link($this->u_action)); + } + // Let the deletion be confirmed... if (confirm_box(true)) { diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 8c0f978298..393d58666d 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -226,7 +226,7 @@ class acp_users add_log('admin', $log, $user->lang['reason']); add_log('user', $user_id, $log, $user->lang['reason']); - trigger_error($user->lang['BAN_SUCCESSFULL'] . adm_back_link($this->u_action . '&u=' . $user_id)); + trigger_error($user->lang['BAN_SUCCESSFUL'] . adm_back_link($this->u_action . '&u=' . $user_id)); break; diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index b5043b8dd5..34f1cb7cb1 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -210,8 +210,9 @@ $lang = array_merge($lang, array( 'IS_NOT_TRANSLATED' => 'Reason has not been localized', 'IS_TRANSLATED' => 'Reason has been localized', - 'NO_REASON' => 'Reason could not be found', - 'NO_REASON_INFO' => 'You have to specify a title and a description for this reason.', + 'NO_REASON' => 'Reason could not be found', + 'NO_REASON_INFO' => 'You have to specify a title and a description for this reason.', + 'NO_REMOVE_DEFAULT_REASON' => 'You are not able to remove the default reason "Other".', 'REASON_ADD' => 'Add report/denial reason', 'REASON_ADDED' => 'Report/denial reason successfully added', diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php index e60a2b7181..f928a99b5f 100644 --- a/phpBB/language/en/acp/users.php +++ b/phpBB/language/en/acp/users.php @@ -31,7 +31,7 @@ if (empty($lang) || !is_array($lang)) $lang = array_merge($lang, array( 'ADMIN_SIG_PREVIEW' => 'Signature preview', - 'BAN_SUCCESSFULL' => 'Ban entered successfully', + 'BAN_SUCCESSFUL' => 'Ban entered successfully', 'CANNOT_REMOVE_ANONYMOUS' => 'You are not able to remove the guest user account.', 'CANNOT_REMOVE_YOURSELF' => 'You are not allowed to remove your own user account.', |