mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-06 14:35:56 +02:00
Code Issues Releases Wiki Activity

add group_legend to group management

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@5740 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-03-28 13:47:16 +00:00
parent f52ef0a6ec
commit b6b43a7580
5 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/adm/style/acp_groups.html
View File

@ -54,6 +54,10 @@
<fieldset> <fieldset>
<legend>{L_GROUP_SETTINGS_SAVE}</legend> <legend>{L_GROUP_SETTINGS_SAVE}</legend>
<dl>
<dt><label for="group_legend">{L_GROUP_LEGEND}:</label></dt>
<dd><input name="group_legend" type="checkbox" id="group_legend"{GROUP_LEGEND} /></dd>
</dl>
<dl> <dl>
<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}:</label></dt> <dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}:</label></dt>
<dd><input name="group_receive_pm" type="checkbox" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd> <dd><input name="group_receive_pm" type="checkbox" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd>

4
phpBB/includes/acp/acp_groups.php
View File

@ -259,6 +259,7 @@ class acp_groups
'colour' => request_var('group_colour', ''), 'colour' => request_var('group_colour', ''),
'rank' => request_var('group_rank', 0), 'rank' => request_var('group_rank', 0),
'receive_pm' => isset($_REQUEST['group_receive_pm']) ? 1 : 0, 'receive_pm' => isset($_REQUEST['group_receive_pm']) ? 1 : 0,
'legend' => isset($_REQUEST['group_legend']) ? 1 : 0,
'message_limit' => request_var('group_message_limit', 0) 'message_limit' => request_var('group_message_limit', 0)
); );
@ -319,7 +320,7 @@ class acp_groups
// were made. // were made.
$group_attributes = array(); $group_attributes = array();
$test_variables = array('rank', 'colour', 'avatar', 'avatar_type', 'avatar_width', 'avatar_height', 'receive_pm', 'message_limit'); $test_variables = array('rank', 'colour', 'avatar', 'avatar_type', 'avatar_width', 'avatar_height', 'receive_pm', 'legend', 'message_limit');
foreach ($test_variables as $test) foreach ($test_variables as $test)
{ {
if (isset($submit_ary[$test]) && ($action == 'add' || $group_row['group_' . $test] != $submit_ary[$test])) if (isset($submit_ary[$test]) && ($action == 'add' || $group_row['group_' . $test] != $submit_ary[$test]))
@ -491,6 +492,7 @@ class acp_groups
'GROUP_INTERNAL_NAME' => $group_name, 'GROUP_INTERNAL_NAME' => $group_name,
'GROUP_DESC' => $group_desc_data['text'], 'GROUP_DESC' => $group_desc_data['text'],
'GROUP_RECEIVE_PM' => (isset($group_row['group_receive_pm']) && $group_row['group_receive_pm']) ? ' checked="checked"' : '', 'GROUP_RECEIVE_PM' => (isset($group_row['group_receive_pm']) && $group_row['group_receive_pm']) ? ' checked="checked"' : '',
'GROUP_LEGEND' => (isset($group_row['group_legend']) && $group_row['group_legend']) ? ' checked="checked"' : '',
'GROUP_MESSAGE_LIMIT' => (isset($group_row['group_message_limit'])) ? $group_row['group_message_limit'] : 0, 'GROUP_MESSAGE_LIMIT' => (isset($group_row['group_message_limit'])) ? $group_row['group_message_limit'] : 0,
'GROUP_COLOUR' => (isset($group_row['group_colour'])) ? $group_row['group_colour'] : '', 'GROUP_COLOUR' => (isset($group_row['group_colour'])) ? $group_row['group_colour'] : '',

32
phpBB/includes/acp/acp_users.php
View File

@ -226,7 +226,7 @@ class acp_users
add_log('admin', $log, $user->lang['reason']); add_log('admin', $log, $user->lang['reason']);
add_log('user', $user_id, $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)); trigger_error($user->lang['BAN_SUCCESSFULL'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
break; break;
@ -274,7 +274,7 @@ class acp_users
add_log('admin', 'LOG_USER_REACTIVATE', $user_row['username']); add_log('admin', 'LOG_USER_REACTIVATE', $user_row['username']);
add_log('user', $user_id, 'LOG_USER_REACTIVATE_USER'); add_log('user', $user_id, 'LOG_USER_REACTIVATE_USER');
trigger_error($user->lang['FORCE_REACTIVATION_SUCCESS'] . adm_back_link($this->u_action)); trigger_error($user->lang['FORCE_REACTIVATION_SUCCESS'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
} }
break; break;
@ -288,7 +288,7 @@ class acp_users
add_log('user', $user_id, $log . '_USER'); add_log('user', $user_id, $log . '_USER');
trigger_error($user->lang[$message] . adm_back_link($this->u_action)); trigger_error($user->lang[$message] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
break; break;
@ -307,7 +307,7 @@ class acp_users
add_log('admin', 'LOG_USER_DEL_SIG', $user_row['username']); add_log('admin', 'LOG_USER_DEL_SIG', $user_row['username']);
add_log('user', $user_id, 'LOG_USER_DEL_SIG_USER'); add_log('user', $user_id, 'LOG_USER_DEL_SIG_USER');
trigger_error($user->lang['USER_ADMIN_SIG_REMOVED'] . adm_back_link($this->u_action)); trigger_error($user->lang['USER_ADMIN_SIG_REMOVED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
break; break;
@ -334,7 +334,7 @@ class acp_users
add_log('admin', 'LOG_USER_DEL_AVATAR', $user_row['username']); add_log('admin', 'LOG_USER_DEL_AVATAR', $user_row['username']);
add_log('user', $user_id, 'LOG_USER_DEL_AVATAR_USER'); add_log('user', $user_id, 'LOG_USER_DEL_AVATAR_USER');
trigger_error($user->lang['USER_ADMIN_AVATAR_REMOVED'] . adm_back_link($this->u_action)); trigger_error($user->lang['USER_ADMIN_AVATAR_REMOVED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
break; break;
case 'delposts': case 'delposts':
@ -383,7 +383,7 @@ class acp_users
delete_posts('poster_id', $user_id); delete_posts('poster_id', $user_id);
add_log('admin', 'LOG_USER_DEL_POSTS', $user_row['username']); add_log('admin', 'LOG_USER_DEL_POSTS', $user_row['username']);
trigger_error($user->lang['USER_POSTS_DELETED'] . adm_back_link($this->u_action)); trigger_error($user->lang['USER_POSTS_DELETED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
} }
else else
{ {
@ -405,7 +405,7 @@ class acp_users
delete_attachments('user', $user_id); delete_attachments('user', $user_id);
add_log('admin', 'LOG_USER_DEL_ATTACH', $user_row['username']); add_log('admin', 'LOG_USER_DEL_ATTACH', $user_row['username']);
trigger_error($user->lang['USER_ATTACHMENTS_REMOVED'] . adm_back_link($this->u_action)); trigger_error($user->lang['USER_ATTACHMENTS_REMOVED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
} }
else else
{ {
@ -553,7 +553,7 @@ class acp_users
add_log('admin', 'LOG_USER_MOVE_POSTS', $user_row['username'], $forum_info['forum_name']); add_log('admin', 'LOG_USER_MOVE_POSTS', $user_row['username'], $forum_info['forum_name']);
add_log('user', $user_id, 'LOG_USER_MOVE_POSTS_USER', $forum_info['forum_name']); add_log('user', $user_id, 'LOG_USER_MOVE_POSTS_USER', $forum_info['forum_name']);
trigger_error($user->lang['USER_POSTS_MOVED'] . adm_back_link($this->u_action)); trigger_error($user->lang['USER_POSTS_MOVED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
break; break;
} }
@ -701,7 +701,7 @@ class acp_users
add_log('admin', 'LOG_USER_USER_UPDATE', $data['username']); add_log('admin', 'LOG_USER_USER_UPDATE', $data['username']);
trigger_error($user->lang['USER_OVERVIEW_UPDATED'] . adm_back_link($this->u_action)); trigger_error($user->lang['USER_OVERVIEW_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
} }
// Replace "error" strings with their real, localised form // Replace "error" strings with their real, localised form
@ -793,7 +793,7 @@ class acp_users
add_log('admin', 'LOG_USER_FEEDBACK', $user_row['username']); add_log('admin', 'LOG_USER_FEEDBACK', $user_row['username']);
add_log('user', $user_id, 'LOG_USER_GENERAL', $message); add_log('user', $user_id, 'LOG_USER_GENERAL', $message);
trigger_error($user->lang['USER_FEEDBACK_ADDED'] . adm_back_link($this->u_action)); trigger_error($user->lang['USER_FEEDBACK_ADDED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
} }
// Sorting // Sorting
@ -947,7 +947,7 @@ class acp_users
} }
} }
trigger_error($user->lang['USER_PROFILE_UPDATED'] . adm_back_link($this->u_action)); trigger_error($user->lang['USER_PROFILE_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
} }
// Replace "error" strings with their real, localised form // Replace "error" strings with their real, localised form
@ -1112,7 +1112,7 @@ class acp_users
WHERE user_id = $user_id"; WHERE user_id = $user_id";
$db->sql_query($sql); $db->sql_query($sql);
trigger_error($user->lang['USER_PREFS_UPDATED'] . adm_back_link($this->u_action)); trigger_error($user->lang['USER_PREFS_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
} }
// Replace "error" strings with their real, localised form // Replace "error" strings with their real, localised form
@ -1329,7 +1329,7 @@ class acp_users
} }
} }
trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action)); trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
} }
// Replace "error" strings with their real, localised form // Replace "error" strings with their real, localised form
@ -1392,7 +1392,7 @@ class acp_users
WHERE user_id = $user_id"; WHERE user_id = $user_id";
$db->sql_query($sql); $db->sql_query($sql);
trigger_error($user->lang['USER_RANK_UPDATED'] . adm_back_link($this->u_action)); trigger_error($user->lang['USER_RANK_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
} }
$sql = 'SELECT * $sql = 'SELECT *
@ -1455,7 +1455,7 @@ class acp_users
WHERE user_id = ' . $user_id; WHERE user_id = ' . $user_id;
$db->sql_query($sql); $db->sql_query($sql);
trigger_error($user->lang['USER_SIG_UPDATED'] . adm_back_link($this->u_action)); trigger_error($user->lang['USER_SIG_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
} }
// Replace "error" strings with their real, localised form // Replace "error" strings with their real, localised form
@ -1528,7 +1528,7 @@ class acp_users
$message = (sizeof($log_attachments) == 1) ? $user->lang['ATTACHMENT_DELETED'] : $user->lang['ATTACHMENTS_DELETED']; $message = (sizeof($log_attachments) == 1) ? $user->lang['ATTACHMENT_DELETED'] : $user->lang['ATTACHMENTS_DELETED'];
add_log('admin', $log, implode(', ', $log_attachments)); add_log('admin', $log, implode(', ', $log_attachments));
trigger_error($message . adm_back_link($this->u_action)); trigger_error($message . adm_back_link($this->u_action . '&amp;u=' . $user_id));
} }
else else
{ {

3
phpBB/includes/functions_user.php
View File

@ -1156,11 +1156,12 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
'group_avatar_height' => 'int', 'group_avatar_height' => 'int',
'group_receive_pm' => 'int', 'group_receive_pm' => 'int',
'group_legend' => 'int',
'group_message_limit' => 'int', 'group_message_limit' => 'int',
); );
// Those are group-only attributes // Those are group-only attributes
$group_only_ary = array('group_receive_pm', 'group_message_limit'); $group_only_ary = array('group_receive_pm', 'group_legend', 'group_message_limit');
// Check data // Check data
if (!strlen($name) || strlen($name) > 40) if (!strlen($name) || strlen($name) > 40)

1
phpBB/language/en/acp/groups.php
View File

@ -64,6 +64,7 @@ $lang = array_merge($lang, array(
'GROUP_HIDDEN' => 'Hidden', 'GROUP_HIDDEN' => 'Hidden',
'GROUP_LANG' => 'Group language', 'GROUP_LANG' => 'Group language',
'GROUP_LEAD' => 'Group leaders', 'GROUP_LEAD' => 'Group leaders',
'GROUP_LEGEND' => 'Display group in legend',
'GROUP_LIST' => 'Current members', 'GROUP_LIST' => 'Current members',
'GROUP_LIST_EXPLAIN' => 'This is a complete list of all the current users with membership of this group. You can delete members (except in certain special groups) or add new ones as you see fit.', 'GROUP_LIST_EXPLAIN' => 'This is a complete list of all the current users with membership of this group. You can delete members (except in certain special groups) or add new ones as you see fit.',
'GROUP_MEMBERS' => 'Group members', 'GROUP_MEMBERS' => 'Group members',