From 7d84cac202ce0e7ea04525d428225176d518b5e5 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Thu, 4 Oct 2007 15:08:22 +0000 Subject: [PATCH] #14621 #14596 info file changes git-svn-id: file:///svn/phpbb/trunk@8135 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/acp/info/acp_attachments.php | 6 ++-- phpBB/includes/acp/info/acp_ban.php | 6 ++-- phpBB/includes/acp/info/acp_bbcodes.php | 6 ++-- phpBB/includes/acp/info/acp_board.php | 6 ++-- phpBB/includes/acp/info/acp_bots.php | 6 ++-- phpBB/includes/acp/info/acp_captcha.php | 6 ++-- phpBB/includes/acp/info/acp_database.php | 6 ++-- phpBB/includes/acp/info/acp_disallow.php | 6 ++-- phpBB/includes/acp/info/acp_email.php | 6 ++-- phpBB/includes/acp/info/acp_forums.php | 6 ++-- phpBB/includes/acp/info/acp_groups.php | 6 ++-- phpBB/includes/acp/info/acp_icons.php | 6 ++-- phpBB/includes/acp/info/acp_inactive.php | 6 ++-- phpBB/includes/acp/info/acp_jabber.php | 6 ++-- phpBB/includes/acp/info/acp_language.php | 6 ++-- phpBB/includes/acp/info/acp_logs.php | 6 ++-- phpBB/includes/acp/info/acp_main.php | 6 ++-- phpBB/includes/acp/info/acp_modules.php | 6 ++-- .../acp/info/acp_permission_roles.php | 6 ++-- phpBB/includes/acp/info/acp_permissions.php | 6 ++-- phpBB/includes/acp/info/acp_php_info.php | 6 ++-- phpBB/includes/acp/info/acp_profile.php | 6 ++-- phpBB/includes/acp/info/acp_prune.php | 6 ++-- phpBB/includes/acp/info/acp_ranks.php | 6 ++-- phpBB/includes/acp/info/acp_reasons.php | 6 ++-- phpBB/includes/acp/info/acp_search.php | 6 ++-- phpBB/includes/acp/info/acp_styles.php | 6 ++-- phpBB/includes/acp/info/acp_update.php | 6 ++-- phpBB/includes/acp/info/acp_users.php | 6 ++-- phpBB/includes/acp/info/acp_words.php | 6 ++-- phpBB/includes/functions.php | 28 ++++--------------- phpBB/includes/mcp/info/mcp_ban.php | 6 ++-- phpBB/includes/mcp/info/mcp_logs.php | 6 ++-- phpBB/includes/mcp/info/mcp_main.php | 6 ++-- phpBB/includes/mcp/info/mcp_notes.php | 6 ++-- phpBB/includes/mcp/info/mcp_queue.php | 6 ++-- phpBB/includes/mcp/info/mcp_reports.php | 6 ++-- phpBB/includes/mcp/info/mcp_warn.php | 6 ++-- phpBB/includes/ucp/info/ucp_attachments.php | 6 ++-- phpBB/includes/ucp/info/ucp_groups.php | 6 ++-- phpBB/includes/ucp/info/ucp_main.php | 6 ++-- phpBB/includes/ucp/info/ucp_pm.php | 4 +-- phpBB/includes/ucp/info/ucp_prefs.php | 6 ++-- phpBB/includes/ucp/info/ucp_profile.php | 6 ++-- phpBB/includes/ucp/info/ucp_zebra.php | 6 ++-- phpBB/language/en/acp/attachments.php | 11 ++++++-- phpBB/language/en/acp/ban.php | 11 ++++++-- phpBB/language/en/acp/board.php | 5 ++++ phpBB/language/en/acp/bots.php | 11 ++++++-- phpBB/language/en/acp/common.php | 5 ++++ phpBB/language/en/acp/database.php | 5 ++++ phpBB/language/en/acp/email.php | 11 ++++++-- phpBB/language/en/acp/forums.php | 11 ++++++-- phpBB/language/en/acp/groups.php | 5 ++++ phpBB/language/en/acp/language.php | 11 ++++++-- phpBB/language/en/acp/modules.php | 11 ++++++-- phpBB/language/en/acp/permissions.php | 11 ++++++-- phpBB/language/en/acp/permissions_phpbb.php | 5 ++++ phpBB/language/en/acp/posting.php | 5 ++++ phpBB/language/en/acp/profile.php | 5 ++++ phpBB/language/en/acp/prune.php | 11 ++++++-- phpBB/language/en/acp/search.php | 11 ++++++-- phpBB/language/en/acp/styles.php | 5 ++++ phpBB/language/en/acp/users.php | 5 ++++ phpBB/language/en/common.php | 5 ++++ phpBB/language/en/groups.php | 21 ++++++++------ phpBB/language/en/help_bbcode.php | 10 +++++-- phpBB/language/en/help_faq.php | 4 +++ phpBB/language/en/install.php | 5 ++++ phpBB/language/en/mcp.php | 5 ++++ phpBB/language/en/memberlist.php | 11 ++++++-- phpBB/language/en/posting.php | 5 ++++ phpBB/language/en/search.php | 11 ++++++-- phpBB/language/en/search_ignore_words.php | 11 ++++++-- phpBB/language/en/search_synonyms.php | 11 ++++++-- phpBB/language/en/ucp.php | 5 ++++ phpBB/language/en/viewforum.php | 11 ++++++-- phpBB/language/en/viewtopic.php | 11 ++++++-- .../prosilver/template/overall_footer.html | 8 +++--- 80 files changed, 363 insertions(+), 217 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index e49e0f30f2..3134dc76ff 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -109,6 +109,7 @@
  • [Feature] Added completely new hook system to allow better application/mod integration - see docs/hook_system.html
  • [Fix] Correctly delete excess poll options (Bug #14566)
  • [Fix] Allow names evaluating to false for poll options
    • +
  • [Change] use in-build functions for user online list (#14596) - provided by rxu
    • diff --git a/phpBB/includes/acp/info/acp_attachments.php b/phpBB/includes/acp/info/acp_attachments.php index 9ca76e284d..b77785801f 100644 --- a/phpBB/includes/acp/info/acp_attachments.php +++ b/phpBB/includes/acp/info/acp_attachments.php @@ -1,10 +1,10 @@ ' . $row['username'] . ''; - } - else - { - $user_colour = ''; - } - if ($row['session_viewonline']) { - $user_online_link = $row['username']; $logged_visible_online++; } else { - $user_online_link = '' . $row['username'] . ''; + $row['username'] = '' . $row['username'] . ''; $logged_hidden_online++; } if (($row['session_viewonline']) || $auth->acl_get('u_viewonline')) { - if ($row['user_type'] <> USER_IGNORE) - { - $user_online_link = '' . $user_online_link . ''; - } - else - { - $user_online_link = ($user_colour) ? '' . $user_online_link . '' : $user_online_link; - } - + $user_online_link = get_username_string(($row['user_type'] <> USER_IGNORE) ? 'full' : 'no_profile', $row['user_id'], $row['username'], $row['user_colour']); $online_userlist .= ($online_userlist != '') ? ', ' . $user_online_link : $user_online_link; } } diff --git a/phpBB/includes/mcp/info/mcp_ban.php b/phpBB/includes/mcp/info/mcp_ban.php index 75b30174df..383df30498 100644 --- a/phpBB/includes/mcp/info/mcp_ban.php +++ b/phpBB/includes/mcp/info/mcp_ban.php @@ -1,10 +1,10 @@ 'Successfully changed default group.', - 'GROUP_AVATAR' => 'Group avatar', + 'GROUP_AVATAR' => 'Group avatar', 'GROUP_CHANGE_DEFAULT' => 'Are you sure you want to change your default membership to the group “%s”?', 'GROUP_CLOSED' => 'Closed', 'GROUP_DESC' => 'Group description', 'GROUP_HIDDEN' => 'Hidden', - 'GROUP_INFORMATION' => 'Usergroup information', + 'GROUP_INFORMATION' => 'Usergroup information', 'GROUP_IS_CLOSED' => 'This is a closed group, new members can only join upon invitation of a group leader.', - 'GROUP_IS_FREE' => 'This is a freely open group, all new members are welcome.', + 'GROUP_IS_FREE' => 'This is a freely open group, all new members are welcome.', 'GROUP_IS_HIDDEN' => 'This is a hidden group, only members of this group can view its membership.', 'GROUP_IS_OPEN' => 'This is an open group, members can apply to join.', - 'GROUP_IS_SPECIAL' => 'This is a special group, special groups are managed by the board administrators.', + 'GROUP_IS_SPECIAL' => 'This is a special group, special groups are managed by the board administrators.', 'GROUP_JOIN' => 'Join group', 'GROUP_JOIN_CONFIRM' => 'Are you sure you want to join the selected group?', 'GROUP_JOIN_PENDING' => 'Request to join group', @@ -58,7 +63,7 @@ $lang = array_merge($lang, array( 'GROUP_MEMBERS' => 'Group members', 'GROUP_NAME' => 'Group name', 'GROUP_OPEN' => 'Open', - 'GROUP_RANK' => 'Group rank', + 'GROUP_RANK' => 'Group rank', 'GROUP_RESIGN_MEMBERSHIP' => 'Resign group membership', 'GROUP_RESIGN_MEMBERSHIP_CONFIRM' => 'Are you sure you want to resign your membership from the selected group?', 'GROUP_RESIGN_PENDING' => 'Resign a pending group membership', diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php index 5ffe3ac742..00b00c9e19 100644 --- a/phpBB/language/en/help_bbcode.php +++ b/phpBB/language/en/help_bbcode.php @@ -1,17 +1,21 @@ 'absence', 'abridgement' => 'abridgment', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 7c397535ca..c573480863 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -13,6 +13,11 @@ /** * DO NOT CHANGE */ +if (!defined('IN_PHPBB')) +{ + exit; +} + if (empty($lang) || !is_array($lang)) { $lang = array(); diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php index c981c24eb1..546f91587d 100644 --- a/phpBB/language/en/viewforum.php +++ b/phpBB/language/en/viewforum.php @@ -1,18 +1,23 @@
  • {L_INDEX}
    • -
  • class="icon-unsubscribe"class="icon-subscribe" title="{S_WATCH_FORUM_TITLE}">{S_WATCH_FORUM_TITLE}
    • -
  • class="icon-unsubscribe"class="icon-subscribe">{L_WATCH_TOPIC}
    • -
  • {L_BOOKMARK_TOPIC}
    • -
  • {L_BUMP_TOPIC}
    • +
  • class="icon-unsubscribe"class="icon-subscribe">{S_WATCH_FORUM_TITLE}
    • +
  • class="icon-unsubscribe"class="icon-subscribe">{L_WATCH_TOPIC}
    • +
  • {L_BOOKMARK_TOPIC}
    • +
  • {L_BUMP_TOPIC}
  • {L_THE_TEAM} • {L_DELETE_COOKIES} • {S_TIMEZONE}