diff --git a/upload/admin/admin_groups.php b/upload/admin/admin_groups.php index 81c3be58a..5d86807b3 100644 --- a/upload/admin/admin_groups.php +++ b/upload/admin/admin_groups.php @@ -30,7 +30,7 @@ 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'], + 'release_group' => $row['release_group'], ); $mode = 'editgroup'; $template->assign_block_vars('group_edit', array()); @@ -43,7 +43,7 @@ if (!empty($_POST['edit']) || !empty($_POST['new'])) 'group_moderator' => '', 'group_mod_name' => '', 'group_type' => GROUP_OPEN, - 'release_group' => 0, + 'release_group' => 0, ); $mode = 'newgroup'; } @@ -68,7 +68,7 @@ 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, + 'RELEASE_GROUP' => ($group_info['release_group']) ? true : false, 'S_GROUP_ACTION' => "admin_groups.php", 'S_HIDDEN_FIELDS' => $s_hidden_fields, )); @@ -92,11 +92,10 @@ 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']) : ''; - + $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']) : ''; $group_moderator = isset($_POST['username']) ? $_POST['username'] : ''; if ($group_name === '') @@ -116,7 +115,7 @@ else if (!empty($_POST['group_update'])) $sql_ary = array( 'group_type' => (int) $group_type, - 'release_group' => (int) $release_group, + 'release_group' => (int) $release_group, 'group_name' => (string) $group_name, 'group_description' => (string) $group_desc, 'group_moderator' => (int) $group_moderator, @@ -134,7 +133,7 @@ else if (!empty($_POST['group_update'])) { // Create user_group for new group's moderator add_user_into_group($group_id, $group_moderator); - $sql_ary['group_time'] = TIMENOW; + $sql_ary['group_time'] = TIMENOW; // Delete old moderator's user_group if (isset($_POST['delete_old_moderator'])) diff --git a/upload/ajax/edit_group_profile.php b/upload/ajax/edit_group_profile.php index 1b6356d04..8d659a090 100644 --- a/upload/ajax/edit_group_profile.php +++ b/upload/ajax/edit_group_profile.php @@ -6,38 +6,40 @@ global $bb_cfg, $userdata, $lang; if (!$group_id = intval($this->request['group_id']) OR !$group_info = get_group_data($group_id)) { - $this->ajax_die($lang['NO_GROUP_ID_SPECIFIED']); + $this->ajax_die($lang['NO_GROUP_ID_SPECIFIED']); } if (!$mode = (string) $this->request['mode']) { - $this->ajax_die('No mode specified'); + $this->ajax_die('No mode specified'); } $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']); + $this->ajax_die($lang['ONLY_FOR_MOD']); } switch ($mode) { - case 'group_name': - case 'group_description': - $value = htmlCHR($value); - $this->response['new_value'] = $value; - break; - case 'group_type': - $this->response['new_value'] = $value; - break; - case 'release_group': - $this->response['new_value'] = $value; - break; - default: - $this->ajax_die('Unknown mode'); + case 'group_name': + case 'group_description': + $value = htmlCHR($value); + $this->response['new_value'] = $value; + break; + case 'group_type': + $this->response['new_value'] = $value; + break; + case 'release_group': + $this->response['new_value'] = $value; + break; + + default: + $this->ajax_die('Unknown mode'); } + $value_sql = DB()->escape($value, true); DB()->query("UPDATE ". BB_GROUPS ." SET $mode = $value_sql WHERE group_id = $group_id LIMIT 1"); @@ -46,5 +48,4 @@ DB()->query("UPDATE ". BB_GROUPS ." SET $mode = $value_sql WHERE group_id = $gro $this->response['new_value'] = $value; $this->response['group_id'] = $group_id; $this->response['mode'] = $mode; -*/ - +*/ \ No newline at end of file diff --git a/upload/group_config.php b/upload/group_config.php index 45a44c030..1016873f8 100644 --- a/upload/group_config.php +++ b/upload/group_config.php @@ -17,75 +17,72 @@ $is_moderator = false; if ($group_id) { - if (!$group_info = get_group_data($group_id)) - { - bb_die($lang['GROUP_NOT_EXIST']); - } - if (!$group_info['group_id'] || !$group_info['group_moderator'] || !$group_info['moderator_name']) - { - bb_die("Invalid group data [group_id: $group_id]"); - } - $is_moderator = ($userdata['user_id'] == $group_info['group_moderator'] || IS_ADMIN); + if (!$group_info = get_group_data($group_id)) + { + bb_die($lang['GROUP_NOT_EXIST']); + } + if (!$group_info['group_id'] || !$group_info['group_moderator'] || !$group_info['moderator_name']) + { + bb_die("Invalid group data [group_id: $group_id]"); + } + $is_moderator = ($userdata['user_id'] == $group_info['group_moderator'] || IS_ADMIN); } if ($is_moderator) { - // TODO Creation Date, Admin panel, Avatar, Some tasty features + // TODO Creation Date, Admin panel, Avatar, Some tasty features - $group_type = ''; - if ($group_info['group_type'] == GROUP_OPEN) - { - $group_type = $lang['GROUP_OPEN']; - } - elseif ($group_info['group_type'] == GROUP_CLOSED) - { - $group_type = $lang['GROUP_CLOSED']; - } - elseif ($group_info['group_type'] == GROUP_HIDDEN) - { - $group_type = $lang['GROUP_HIDDEN']; - } + $group_type = ''; + if ($group_info['group_type'] == GROUP_OPEN) + { + $group_type = $lang['GROUP_OPEN']; + } + elseif ($group_info['group_type'] == GROUP_CLOSED) + { + $group_type = $lang['GROUP_CLOSED']; + } + elseif ($group_info['group_type'] == GROUP_HIDDEN) + { + $group_type = $lang['GROUP_HIDDEN']; + } - $s_hidden_fields = ''; + $s_hidden_fields = ''; - $template->assign_vars(array( - 'PAGE_TITLE' => $lang['GROUP_CONTROL_PANEL'], - 'GROUP_NAME' => htmlCHR($group_info['group_name']), - 'GROUP_ID' => $group_id, - 'GROUP_DESCRIPTION' => htmlCHR($group_info['group_description']), + $template->assign_vars(array( + 'PAGE_TITLE' => $lang['GROUP_CONTROL_PANEL'], + 'GROUP_NAME' => htmlCHR($group_info['group_name']), + 'GROUP_ID' => $group_id, + 'GROUP_DESCRIPTION' => htmlCHR($group_info['group_description']), + 'U_GROUP_URL' => GROUP_URL . $group_id, + 'GROUP_TYPE' => $group_type, + 'S_GROUP_OPEN_TYPE' => GROUP_OPEN, + 'S_GROUP_CLOSED_TYPE' => GROUP_CLOSED, + 'S_GROUP_HIDDEN_TYPE' => GROUP_HIDDEN, + 'S_GROUP_OPEN_CHECKED' => ($group_info['group_type'] == GROUP_OPEN) ? ' checked="checked"' : '', + 'S_GROUP_CLOSED_CHECKED' => ($group_info['group_type'] == GROUP_CLOSED) ? ' checked="checked"' : '', + 'S_GROUP_HIDDEN_CHECKED' => ($group_info['group_type'] == GROUP_HIDDEN) ? ' checked="checked"' : '', + 'S_HIDDEN_FIELDS' => $s_hidden_fields, + 'S_GROUPCP_ACTION' => "groupcp.php?" . POST_GROUPS_URL . "=$group_id", + 'RELEASE_GROUP' => ($group_info['release_group']) ? true : false, + )); - 'U_GROUP_URL' => GROUP_URL . $group_id, + $template->set_filenames(array('body' => 'group_config.tpl')); + $template->assign_vars(array('PAGE_TITLE' => $lang['GROUP_CONFIGURATION'])); - 'GROUP_TYPE' => $group_type, - 'S_GROUP_OPEN_TYPE' => GROUP_OPEN, - 'S_GROUP_CLOSED_TYPE' => GROUP_CLOSED, - 'S_GROUP_HIDDEN_TYPE' => GROUP_HIDDEN, - 'S_GROUP_OPEN_CHECKED' => ($group_info['group_type'] == GROUP_OPEN) ? ' checked="checked"' : '', - 'S_GROUP_CLOSED_CHECKED' => ($group_info['group_type'] == GROUP_CLOSED) ? ' checked="checked"' : '', - 'S_GROUP_HIDDEN_CHECKED' => ($group_info['group_type'] == GROUP_HIDDEN) ? ' checked="checked"' : '', - 'S_HIDDEN_FIELDS' => $s_hidden_fields, - 'S_GROUPCP_ACTION' => "groupcp.php?" . POST_GROUPS_URL . "=$group_id", - 'RELEASE_GROUP' => ($group_info['release_group']) ? true : false, - )); + require(PAGE_HEADER); - $template->set_filenames(array('body' => 'group_config.tpl')); + $template->pparse('body'); - $template->assign_vars(array('PAGE_TITLE' => $lang['GROUP_CONFIGURATION'])); - - require(PAGE_HEADER); - - $template->pparse('body'); - - require(PAGE_FOOTER); + require(PAGE_FOOTER); } else { - $redirect = 'index.php'; + $redirect = 'index.php'; - if ($group_id) - { - $redirect = GROUP_URL . $group_id; - } - redirect($redirect); + if ($group_id) + { + $redirect = GROUP_URL . $group_id; + } + redirect($redirect); } \ No newline at end of file diff --git a/upload/groupcp.php b/upload/groupcp.php index af56db610..b4672599a 100644 --- a/upload/groupcp.php +++ b/upload/groupcp.php @@ -145,11 +145,11 @@ if (!$group_id) { $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 .= '
  • '. $text .'
  • '; - $options .= ($data['rg']) ? '