diff --git a/phpBB/adm/admin_groups.php b/phpBB/adm/admin_groups.php index 2a609afe78..f6855035f9 100644 --- a/phpBB/adm/admin_groups.php +++ b/phpBB/adm/admin_groups.php @@ -68,6 +68,7 @@ $start = (isset($_GET['start']) && $mode == 'member') ? intval($_GET['start']) : $start_mod = (isset($_GET['start']) && $mode == 'mod') ? intval($_GET['start']) : 0; $start_pend = (isset($_GET['start']) && $mode == 'pend') ? intval($_GET['start']) : 0; + // Grab basic data for group, if group_id is set since it's used // in several places below if (!empty($group_id)) @@ -157,8 +158,8 @@ switch ($action) $start = 0; do { - $sql = "SELECT user_id - FROM " . USER_GROUP_TABLE . " + $sql = 'SELECT user_id + FROM ' . USER_GROUP_TABLE . " WHERE group_id = $group_id LIMIT $start, 500"; $result = $db->sql_query($sql); @@ -174,7 +175,7 @@ switch ($action) } while ($row = $db->sql_fetchrow($result)); - $sql = "UPDATE " . USERS_TABLE . " + $sql = 'UPDATE ' . USERS_TABLE . " SET $user_sql WHERE user_id IN ($user_id_sql)"; $db->sql_query($sql); @@ -200,7 +201,7 @@ switch ($action) break; default: - $sql = "UPDATE " . USERS_TABLE . " + $sql ='"UPDATE ' . USERS_TABLE . " SET $user_sql WHERE user_id IN ( SELECT user_id @@ -221,10 +222,10 @@ switch ($action) sql_query($sql); $rank_options = ''; @@ -277,13 +278,13 @@ function swatch() ?> - lang['GROUP_NAME']; ?>: + lang['GROUP_NAME']; ?>: - lang['GROUP_DESC']; ?>: - + lang['GROUP_DESC']; ?>: + - lang['GROUP_TYPE']; ?>:
lang['GROUP_TYPE_EXPLAIN']; ?> + lang['GROUP_TYPE']; ?>:
lang['GROUP_TYPE_EXPLAIN']; ?> /> lang['GROUP_OPEN']; ?>   /> lang['GROUP_REQUEST']; ?>   /> lang['GROUP_CLOSED']; ?>   /> lang['GROUP_HIDDEN']; ?> lang['GROUP_SETTINGS_SAVE']; ?> - lang['GROUP_COLOR']; ?>:
lang['GROUP_COLOR_EXPLAIN'], '', ''); ?> - + lang['GROUP_COLOR']; ?>:
lang['GROUP_COLOR_EXPLAIN'], '', ''); ?> + - lang['GROUP_RANK']; ?>: + lang['GROUP_RANK']; ?>:   - -

lang['GROUP_SETTINGS']; ?>

- -

lang['GROUP_SETTINGS_EXPLAIN']; ?>

- -
"> - - - - - - - - - - - - - - - - - - -
lang['GROUP_SETTINGS']; ?>
lang['GROUP_LANG']; ?>:
lang['GROUP_TIMEZONE']; ?>:
lang['GROUP_DST']; ?>: lang['DISABLED']; ?>   lang['ENABLED']; ?>   lang['USER_DEFAULT']; ?>
 
- -sql_query($sql); @@ -517,7 +482,7 @@ function swatch()

lang['GROUP_MODS_EXPLAIN']; ?>

-
"> +">
@@ -527,17 +492,17 @@ function swatch() sql_query($sql); $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); - $total_members = $row['total_members']; + $total_moderators = $row['total_members']; - $sql = "SELECT u.user_id, u.username, u.user_regdate, u.user_posts - FROM " . USERS_TABLE . " u, " . GROUPS_MODERATOR_TABLE . " gm + $sql = 'SELECT u.user_id, u.username, u.user_regdate, u.user_posts + FROM ' . USERS_TABLE . ' u, ' . GROUPS_MODERATOR_TABLE . " gm WHERE gm.group_id = $group_id AND u.user_id = gm.user_id ORDER BY u.username @@ -566,17 +531,13 @@ function swatch() } while ($row = $db->sql_fetchrow($result) ); -?> - - - + - - - - - - - - -
lang['USERNAME']; ?> lang['JOINED']; ?>
lang['GROUPS_NO_MODS']; ?>lang['GROUPS_NO_MODS']; ?>
lang['ADD_USERS']; ?>
  &mode=searchuser&form=mod&field=usernames', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" />
- +
- + -
lang['MARK_ALL']; ?> :: lang['UNMARK_ALL']; ?> 
- -sql_query($sql); - - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - $total_members = $row['total_members']; - - $sql = "SELECT u.user_id, u.username, u.user_regdate, u.user_posts - FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug - WHERE ug.group_id = $group_id - AND ug.user_pending = 1 - AND u.user_id = ug.user_id - ORDER BY u.username - LIMIT $start_pend, " . $config['topics_per_page']; - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result) ) - { - -?> -

lang['GROUP_PENDING']; ?>

- -

lang['GROUP_PENDING_EXPLAIN']; ?>

- -
"> - - - - - - - - - - - - - -sql_fetchrow($result) ); - -?> - - - - - - - - - - - -
lang['USERNAME']; ?>lang['JOINED']; ?>lang['POSTS']; ?>lang['MARK']; ?>
" target="_profile">format_date($row['user_regdate'], $user->lang['DATE_FORMAT']); ?>
lang['ADD_USERS']; ?>
  &mode=searchuser&form=pend&field=usernames', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" />
- +
+ +
- - + + + + + + +
lang['MARK_ALL']; ?> :: lang['UNMARK_ALL']; ?> 
lang['ADD_USERS']; ?>
  &mode=searchuser&form=mod&field=usernames', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" />
- sql_freeresult($result); } // Existing members - $skip_user_sql = (sizeof($group_mod_ary)) ? ' AND ug.user_id NOT IN (' . implode(', ', $group_mod_ary) . ')' : ''; - $sql = "SELECT COUNT(ug.user_id) AS total_members - FROM " . USER_GROUP_TABLE . " ug - WHERE ug.group_id = $group_id - AND ug.user_pending = 0 - $skip_user_sql"; + $sql = 'SELECT COUNT(ug.user_id) AS total_members + FROM ' . USER_GROUP_TABLE . " ug + WHERE ug.group_id = $group_id"; $result = $db->sql_query($sql); $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); - $total_members = $row['total_members']; + $total_members = $row['total_members'] - $total_moderators; - $sql = "SELECT u.user_id, u.username, u.user_regdate, u.user_posts - FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug + $sql = 'SELECT u.user_id, u.username, u.user_regdate, u.user_posts, ug.user_pending + FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug WHERE ug.group_id = $group_id - AND ug.user_pending = 0 AND u.user_id = ug.user_id $skip_user_sql - ORDER BY u.username + ORDER BY ug.user_pending DESC, u.username LIMIT $start, " . $config['topics_per_page']; $result = $db->sql_query($sql); if ($row = $db->sql_fetchrow($result) ) { + $pending = $row['user_pending']; + + // TODO + $user->lang['DATE_FORMAT'] = 'd M Y'; ?>

lang['GROUP_LIST']; ?>

lang['GROUP_LIST_EXPLAIN']; ?>

- -
"> +">
@@ -731,9 +613,31 @@ function swatch() + + + + + + + + + + + @@ -752,22 +656,30 @@ function swatch() - - - - - - - - -
lang['USERNAME']; ?> lang['JOINED']; ?>
Pending Members
Approved Members
lang['ADD_USERS']; ?>

lang['USER_GETS_GROUP_SET']; ?> lang['YES']; ?>   lang['NO']; ?>
  &mode=searchuser&form=list&field=usernames', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" />
- +
+
lang['MARK_ALL']; ?> :: lang['UNMARK_ALL']; ?> 
+ +
+ + + + + + + + + + + + + +
lang['ADD_USERS']; ?>
lang['USER_GETS_GROUP_SET']; ?> lang['YES']; ?>   lang['NO']; ?>
  &mode=searchuser&form=mod&field=usernames', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" />
+

lang['GROUP_SETTINGS']; ?>

+ +

lang['GROUP_SETTINGS_EXPLAIN']; ?>

+ +
"> + + + + + + + + + + + + + + + + + + +
lang['GROUP_SETTINGS']; ?>
lang['GROUP_LANG']; ?>:
lang['GROUP_TIMEZONE']; ?>:
lang['GROUP_DST']; ?>: lang['DISABLED']; ?>   lang['ENABLED']; ?>   lang['USER_DEFAULT']; ?>
 
+ + @@ -794,28 +750,27 @@ function swatch()
"> - + sql_query($sql); $special_toggle = false; - if ($row = $db->sql_fetchrow($result) ) + while ($row = $db->sql_fetchrow($result) ) { - do - { + $row_class = ($row_class != 'row1') ? 'row1' : 'row2'; - if ($row['group_type'] == GROUP_SPECIAL && !$special_toggle) - { - $special_toggle = true; + if ($row['group_type'] == GROUP_SPECIAL && !$special_toggle) + { + $special_toggle = true; ?> - +
lang['MANAGE']; ?>lang['ACTION']; ?>lang['ACTION']; ?>
Create new group:
@@ -830,34 +785,35 @@ function swatch() lang['G_' . $row['group_name']]))? $user->lang['G_' . $row['group_name']] : $row['group_name']; + $group_id = $row['group_id']; + $group_name = (!empty($user->lang['G_' . $row['group_name']]))? $user->lang['G_' . $row['group_name']] : $row['group_name']; ?> "> -  ">lang['EDIT']; ?>" align="center" nowrap="nowrap"> ">lang['EDIT']; ?>  + | ">lang['DELETE']; ?> +  ">lang['DELETE']; ?>  +  + } + +?> @@ -866,10 +822,8 @@ function swatch() sql_fetchrow($result) ); } $db->sql_freeresult($result); @@ -881,6 +835,7 @@ function swatch()