makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-26 20:08:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

added some language strings as well as fixing the activity listing (Yawner, could you please test it again at area51?)

Browse source 
git-svn-id: file:///svn/phpbb/trunk@5695 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-03-22 10:33:30 +00:00
parent b206d63c51
commit 6e166aa889
5 changed files with 96 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/adm/style/admin.css
View file

@ -383,7 +383,7 @@ option {
padding-right: 1em; padding-right: 1em;
} }
.sep { .sep {
color: white; color: black;
background-color: #FFA34F; background-color: #FFA34F;
} }
textarea { textarea {

64
phpBB/includes/ucp/ucp_main.php
View file

@ -772,41 +772,51 @@ class ucp_main
$forum_read_ary = $auth->acl_getf('!f_read'); $forum_read_ary = $auth->acl_getf('!f_read');
$forum_ary = array(); $forum_ary = array();
foreach ($post_count_ary as $forum_id => $allowed)
// Do not include those forums the user is not having read access to...
foreach ($forum_read_ary as $forum_id => $not_allowed)
{ {
if ($allowed['f_postcount'] || $forum_read_ary[$forum_id]['f_read']) if ($not_allowed['f_read'])
{ {
$forum_ary[] = $forum_id; $forum_ary[] = (int) $forum_id;
} }
} }
// Now do not include those forums where the posts do not count...
foreach ($post_count_ary as $forum_id => $not_counted)
{
if ($not_counted['f_postcount'])
{
$forum_ary[] = (int) $forum_id;
}
}
$forum_ary = array_unique($forum_ary);
$post_count_sql = (sizeof($forum_ary)) ? 'AND f.forum_id NOT IN (' . implode(', ', $forum_ary) . ')' : ''; $post_count_sql = (sizeof($forum_ary)) ? 'AND f.forum_id NOT IN (' . implode(', ', $forum_ary) . ')' : '';
if ($post_count_sql) $sql = 'SELECT f.forum_id, f.forum_name, COUNT(post_id) AS num_posts
{ FROM ' . POSTS_TABLE . ' p, ' . FORUMS_TABLE . ' f
$sql = 'SELECT f.forum_id, f.forum_name, COUNT(post_id) AS num_posts WHERE p.poster_id = ' . $user->data['user_id'] . "
FROM ' . POSTS_TABLE . ' p, ' . FORUMS_TABLE . ' f AND f.forum_id = p.forum_id
WHERE p.poster_id = ' . $user->data['user_id'] . " $post_count_sql
AND f.forum_id = p.forum_id GROUP BY f.forum_id, f.forum_name
$post_count_sql ORDER BY num_posts DESC";
GROUP BY f.forum_id, f.forum_name $result = $db->sql_query_limit($sql, 1);
ORDER BY num_posts DESC"; $active_f_row = $db->sql_fetchrow($result);
$result = $db->sql_query_limit($sql, 1); $db->sql_freeresult($result);
$active_f_row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
$sql = 'SELECT t.topic_id, t.topic_title, COUNT(p.post_id) AS num_posts $sql = 'SELECT t.topic_id, t.topic_title, COUNT(p.post_id) AS num_posts
FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . ' f FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . ' f
WHERE p.poster_id = ' . $user->data['user_id'] . " WHERE p.poster_id = ' . $user->data['user_id'] . "
AND t.topic_id = p.topic_id AND t.topic_id = p.topic_id
AND f.forum_id = t.forum_id AND f.forum_id = t.forum_id
$post_count_sql $post_count_sql
GROUP BY t.topic_id, t.topic_title GROUP BY t.topic_id, t.topic_title
ORDER BY num_posts DESC"; ORDER BY num_posts DESC";
$result = $db->sql_query_limit($sql, 1); $result = $db->sql_query_limit($sql, 1);
$active_t_row = $db->sql_fetchrow($result); $active_t_row = $db->sql_fetchrow($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);
}
$active_f_name = $active_f_id = $active_f_count = $active_f_pct = ''; $active_f_name = $active_f_id = $active_f_count = $active_f_pct = '';
if (!empty($active_f_row['num_posts'])) if (!empty($active_f_row['num_posts']))

2
phpBB/language/en/posting.php
View file

@ -186,6 +186,8 @@ $lang = array_merge($lang, array(
'USER_CANNOT_EDIT' => 'You cannot edit posts in this forum', 'USER_CANNOT_EDIT' => 'You cannot edit posts in this forum',
'USER_CANNOT_QUOTE' => 'You cannot quote posts in this forum', 'USER_CANNOT_QUOTE' => 'You cannot quote posts in this forum',
'USER_CANNOT_REPLY' => 'You cannot reply in this forum', 'USER_CANNOT_REPLY' => 'You cannot reply in this forum',
'USERNAME_DISALLOWED' => 'The username you entered has been banned.',
'USERNAME_TAKEN' => 'The username you entered is already in use, please select an alternative.',
'VIEW_MESSAGE' => 'Click %sHere%s to view your message', 'VIEW_MESSAGE' => 'Click %sHere%s to view your message',

37
phpBB/language/en/ucp.php
View file

@ -383,26 +383,27 @@ $lang = array_merge($lang, array(
'UCP_USERGROUPS_MEMBER' => 'Memberships', 'UCP_USERGROUPS_MEMBER' => 'Memberships',
'UCP_USERGROUPS_MANAGE' => 'Manage groups', 'UCP_USERGROUPS_MANAGE' => 'Manage groups',
'UCP_REGISTER_DISABLE' => 'Creating a new account is currently not possible.', 'UCP_REGISTER_DISABLE' => 'Creating a new account is currently not possible.',
'UCP_REMIND' => 'Send password', 'UCP_REMIND' => 'Send password',
'UCP_RESEND' => 'Send activation email', 'UCP_RESEND' => 'Send activation email',
'UCP_WATCHED' => 'Watched items', 'UCP_WATCHED' => 'Watched items',
'UCP_WELCOME' => 'Welcome to the User Control Panel. From here you can monitor, view and update your profile, preferences, subscribed forums and topics. You can also send messages to other users (if permitted). Please ensure you read any announcements before continuing.', 'UCP_WELCOME' => 'Welcome to the User Control Panel. From here you can monitor, view and update your profile, preferences, subscribed forums and topics. You can also send messages to other users (if permitted). Please ensure you read any announcements before continuing.',
'UCP_YIM' => 'Yahoo Messenger', 'UCP_YIM' => 'Yahoo Messenger',
'UCP_ZEBRA' => 'Friends and Foes', 'UCP_ZEBRA' => 'Friends and Foes',
'UCP_ZEBRA_FOES' => 'Foes', 'UCP_ZEBRA_FOES' => 'Foes',
'UCP_ZEBRA_FRIENDS' => 'Friends', 'UCP_ZEBRA_FRIENDS' => 'Friends',
'UNKNOWN_FOLDER' => 'Unknown Folder', 'UNKNOWN_FOLDER' => 'Unknown Folder',
'UNREAD_MESSAGES' => 'Unread Messages', 'UNREAD_MESSAGES' => 'Unread Messages',
'UNWATCH_MARKED' => 'Unwatch marked', 'UNWATCH_MARKED' => 'Unwatch marked',
'UPLOAD_AVATAR_FILE' => 'Upload from your machine', 'UPLOAD_AVATAR_FILE' => 'Upload from your machine',
'UPLOAD_AVATAR_URL' => 'Upload from a URL', 'UPLOAD_AVATAR_URL' => 'Upload from a URL',
'UPLOAD_AVATAR_URL_EXPLAIN' => 'Enter the URL of the location containing the image, it will be copied to this site.', 'UPLOAD_AVATAR_URL_EXPLAIN' => 'Enter the URL of the location containing the image, it will be copied to this site.',
'USERNAME_ALPHA_ONLY_EXPLAIN' => 'Username must be between %1$d and %2$d chars long and use only alphanumeric characters', 'USERNAME_ALPHA_ONLY_EXPLAIN' => 'Username must be between %1$d and %2$d chars long and use only alphanumeric characters',
'USERNAME_ALPHA_SPACERS_EXPLAIN'=> 'Username must be between %1$d and %2$d chars long and use alphanumeric, space or -+_[] characters.', 'USERNAME_ALPHA_SPACERS_EXPLAIN'=> 'Username must be between %1$d and %2$d chars long and use alphanumeric, space or -+_[] characters.',
'USERNAME_CHARS_ANY_EXPLAIN'=> 'Length must be between %1$d and %2$d characters.', 'USERNAME_CHARS_ANY_EXPLAIN' => 'Length must be between %1$d and %2$d characters.',
'USERNAME_TAKEN_USERNAME' => 'The username you entered is already in use, please select an alternative.', 'USERNAME_TAKEN_USERNAME' => 'The username you entered is already in use, please select an alternative.',
'USER_NOT_FOUND' => 'The usernames you specified could not be found.', 'USERNAME_USERNAME_DISALLOWED' => 'The username you entered has been banned.',
'USER_NOT_FOUND' => 'The usernames you specified could not be found.',
'VIEW_AVATARS' => 'Display Avatars', 'VIEW_AVATARS' => 'Display Avatars',
'VIEW_EDIT' => 'View/Edit', 'VIEW_EDIT' => 'View/Edit',

63
phpBB/memberlist.php
View file

@ -1168,41 +1168,50 @@ function show_user_activity(&$member)
$forum_read_ary = $auth->acl_getf('!f_read'); $forum_read_ary = $auth->acl_getf('!f_read');
$forum_ary = array(); $forum_ary = array();
foreach ($post_count_ary as $forum_id => $allowed)
// Do not include those forums the user watching this profile is not having read access to...
foreach ($forum_read_ary as $forum_id => $not_allowed)
{ {
if ($allowed['f_postcount'] || $forum_read_ary[$forum_id]['f_read']) if ($not_allowed['f_read'])
{ {
$forum_ary[] = $forum_id; $forum_ary[] = (int) $forum_id;
} }
} }
// Now do not include those forums where the posts do not count for the members profile...
foreach ($post_count_ary as $forum_id => $not_counted)
{
if ($not_counted['f_postcount'])
{
$forum_ary[] = (int) $forum_id;
}
}
$forum_ary = array_unique($forum_ary);
$post_count_sql = (sizeof($forum_ary)) ? 'AND f.forum_id NOT IN (' . implode(', ', $forum_ary) . ')' : ''; $post_count_sql = (sizeof($forum_ary)) ? 'AND f.forum_id NOT IN (' . implode(', ', $forum_ary) . ')' : '';
if ($post_count_sql) $sql = 'SELECT f.forum_id, f.forum_name, COUNT(post_id) AS num_posts
{ FROM ' . POSTS_TABLE . ' p, ' . FORUMS_TABLE . " f
$sql = 'SELECT f.forum_id, f.forum_name, COUNT(post_id) AS num_posts WHERE p.poster_id = {$member['user_id']}
FROM ' . POSTS_TABLE . ' p, ' . FORUMS_TABLE . " f AND f.forum_id = p.forum_id
WHERE p.poster_id = {$member['user_id']} $post_count_sql
AND f.forum_id = p.forum_id GROUP BY f.forum_id, f.forum_name
$post_count_sql ORDER BY num_posts DESC";
GROUP BY f.forum_id, f.forum_name $result = $db->sql_query_limit($sql, 1);
ORDER BY num_posts DESC"; $active_f_row = $db->sql_fetchrow($result);
$result = $db->sql_query_limit($sql, 1); $db->sql_freeresult($result);
$active_f_row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
$sql = 'SELECT t.topic_id, t.topic_title, COUNT(p.post_id) AS num_posts $sql = 'SELECT t.topic_id, t.topic_title, COUNT(p.post_id) AS num_posts
FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f
WHERE p.poster_id = {$member['user_id']} WHERE p.poster_id = {$member['user_id']}
AND t.topic_id = p.topic_id AND t.topic_id = p.topic_id
AND f.forum_id = t.forum_id AND f.forum_id = t.forum_id
$post_count_sql $post_count_sql
GROUP BY t.topic_id, t.topic_title GROUP BY t.topic_id, t.topic_title
ORDER BY num_posts DESC"; ORDER BY num_posts DESC";
$result = $db->sql_query_limit($sql, 1); $result = $db->sql_query_limit($sql, 1);
$active_t_row = $db->sql_fetchrow($result); $active_t_row = $db->sql_fetchrow($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);
}
$member['active_t_row'] = $active_t_row; $member['active_t_row'] = $active_t_row;
$member['active_f_row'] = $active_f_row; $member['active_f_row'] = $active_f_row;