diff --git a/upload/admin/admin_groups.php b/upload/admin/admin_groups.php index 81c3be58a..30b819a04 100644 --- a/upload/admin/admin_groups.php +++ b/upload/admin/admin_groups.php @@ -30,7 +30,6 @@ if (!empty($_POST['edit']) || !empty($_POST['new'])) 'group_moderator' => $row['group_moderator'], 'group_mod_name' => $row['moderator_name'], 'group_type' => $row['group_type'], - 'release_group' => $row['release_group'], ); $mode = 'editgroup'; $template->assign_block_vars('group_edit', array()); @@ -43,7 +42,6 @@ if (!empty($_POST['edit']) || !empty($_POST['new'])) 'group_moderator' => '', 'group_mod_name' => '', 'group_type' => GROUP_OPEN, - 'release_group' => 0, ); $mode = 'newgroup'; } @@ -68,7 +66,6 @@ if (!empty($_POST['edit']) || !empty($_POST['new'])) 'S_GROUP_OPEN_CHECKED' => ($group_info['group_type'] == GROUP_OPEN) ? HTML_CHECKED : '', 'S_GROUP_CLOSED_CHECKED' => ($group_info['group_type'] == GROUP_CLOSED) ? HTML_CHECKED : '', 'S_GROUP_HIDDEN_CHECKED' => ($group_info['group_type'] == GROUP_HIDDEN ) ? HTML_CHECKED : '', - 'RELEASE_GROUP' => ($group_info['release_group']) ? true : false, 'S_GROUP_ACTION' => "admin_groups.php", 'S_HIDDEN_FIELDS' => $s_hidden_fields, )); @@ -93,7 +90,6 @@ else if (!empty($_POST['group_update'])) else { $group_type = isset($_POST['group_type']) ? intval($_POST['group_type']) : GROUP_OPEN; - $release_group = isset($_POST['release_group']) ? intval($_POST['release_group']) : 0; $group_name = isset($_POST['group_name']) ? trim($_POST['group_name']) : ''; $group_desc = isset($_POST['group_description']) ? trim($_POST['group_description']) : ''; @@ -116,7 +112,6 @@ else if (!empty($_POST['group_update'])) $sql_ary = array( 'group_type' => (int) $group_type, - 'release_group' => (int) $release_group, 'group_name' => (string) $group_name, 'group_description' => (string) $group_desc, 'group_moderator' => (int) $group_moderator, diff --git a/upload/ajax/edit_group_profile.php b/upload/ajax/edit_group_profile.php index 1b6356d04..7affe0a48 100644 --- a/upload/ajax/edit_group_profile.php +++ b/upload/ajax/edit_group_profile.php @@ -2,7 +2,7 @@ if (!defined('IN_AJAX')) die(basename(__FILE__)); -global $bb_cfg, $userdata, $lang; +global $bb_cfg, $lang; if (!$group_id = intval($this->request['group_id']) OR !$group_info = get_group_data($group_id)) { @@ -15,10 +15,7 @@ if (!$mode = (string) $this->request['mode']) $value = $this->request['value'] = (string) (isset($this->request['value'])) ? $this->request['value'] : 0; -if (!IS_ADMIN && $userdata['user_id'] != $group_info['group_moderator']) -{ - $this->ajax_die($lang['ONLY_FOR_MOD']); -} +// TODO Check for permissions switch ($mode) { diff --git a/upload/ajax/html/jumpbox_guest.html b/upload/ajax/html/jumpbox_guest.html new file mode 100644 index 000000000..e25cf03e0 --- /dev/null +++ b/upload/ajax/html/jumpbox_guest.html @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/upload/ajax/html/jumpbox_user.html b/upload/ajax/html/jumpbox_user.html new file mode 100644 index 000000000..e25cf03e0 --- /dev/null +++ b/upload/ajax/html/jumpbox_user.html @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/upload/group_config.php b/upload/group_config.php index 45a44c030..fcab87f7b 100644 --- a/upload/group_config.php +++ b/upload/group_config.php @@ -71,7 +71,7 @@ if ($is_moderator) $template->set_filenames(array('body' => 'group_config.tpl')); - $template->assign_vars(array('PAGE_TITLE' => $lang['GROUP_CONFIGURATION'])); + $template->assign_vars(array('PAGE_TITLE' => 'Настройка группы')); require(PAGE_HEADER); diff --git a/upload/groupcp.php b/upload/groupcp.php index f108668c6..e9fd3fb10 100644 --- a/upload/groupcp.php +++ b/upload/groupcp.php @@ -73,7 +73,7 @@ if (!$group_id) $sql = " SELECT - g.group_name, g.group_description, g.group_id, g.group_type, g.release_group, + g.group_name, g.group_description, g.group_id, g.group_type, IF(ug.user_id IS NOT NULL, IF(ug.user_pending = 1, $pending, $member), 0) AS membership, g.group_moderator, u.username AS moderator_name, IF(g.group_moderator = ug.user_id, 1, 0) AS is_group_mod, @@ -130,7 +130,7 @@ if (!$group_id) continue; } - $data = array('id' => $row['group_id'], 'm' => ($row['members'] - $row['candidates']), 'c' => $row['candidates'], 'rg' => $row['release_group']); + $data = array('id' => $row['group_id'], 'm' => ($row['members'] - $row['candidates']), 'c' => $row['candidates']); $groups[$type][$row['group_name']] = $data; } @@ -140,17 +140,15 @@ if (!$group_id) global $lang; $options = ''; - foreach ($params as $name => $data) { $text = htmlCHR(str_short(rtrim($name), HTML_SELECT_MAX_LENGTH)); - $members = ($data['m']) ? $lang['MEMBERS_IN_GROUP'] .': '. $data['m'] : $lang['NO_GROUP_MEMBERS']; + $members = ($data['m']) ? $lang['MEMBERS_IN_GROUP'] .': '. $data['m'] : $lang['NO_GROUP_MEMBERS']; $candidates = ($data['c']) ? $lang['PENDING_MEMBERS'] .': '. $data['c'] : $lang['NO_PENDING_GROUP_MEMBERS']; - $options .= '
- +
diff --git a/upload/templates/default/groupcp.tpl b/upload/templates/default/groupcp.tpl index 5fe2cd091..59feca4ad 100644 --- a/upload/templates/default/groupcp.tpl +++ b/upload/templates/default/groupcp.tpl @@ -56,21 +56,15 @@# | -{L_AVATAR} | +{L_SELECT} | {L_USERNAME} | {L_PM} | {L_EMAIL} | @@ -214,13 +207,12 @@{L_WEBSITE} | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
{L_PENDING_MEMBERS} | +{L_PENDING_MEMBERS} | |||||||||||||||
- | {pending.AVATAR_IMG} | +{pending.USER} | {pending.PM} | {pending.EMAIL} | @@ -232,7 +224,7 @@||||||||||||
+ | diff --git a/upload/triggers/cron_allowed b/upload/triggers/cron_allowed new file mode 100644 index 000000000..e69de29bb |