Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused ranks functionality #405

Merged
merged 1 commit into from Jun 22, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 8 additions & 38 deletions admin/admin_ranks.php
Expand Up @@ -30,9 +30,6 @@

require __DIR__ . '/pagestart.php';

$_POST['special_rank'] = 1;
$_POST['min_posts'] = -1;

if (isset($_GET['mode']) || isset($_POST['mode'])) {
$mode = isset($_GET['mode']) ? $_GET['mode'] : $_POST['mode'];
} else {
Expand Down Expand Up @@ -69,22 +66,14 @@

$rank_info = DB()->sql_fetchrow($result);
$s_hidden_fields .= '<input type="hidden" name="id" value="' . $rank_id . '" />';
} else {
$rank_info['rank_special'] = 0;
}

$s_hidden_fields .= '<input type="hidden" name="mode" value="save" />';

$rank_is_special = !empty($rank_info['rank_special']) ? HTML_CHECKED : '';
$rank_is_not_special = empty($rank_info['rank_special']) ? HTML_CHECKED : '';

$template->assign_vars(array(
'TPL_RANKS_EDIT' => true,

'RANK' => !empty($rank_info['rank_title']) ? $rank_info['rank_title'] : '',
'SPECIAL_RANK' => $rank_is_special,
'NOT_SPECIAL_RANK' => $rank_is_not_special,
'MINIMUM' => $rank_is_special ? '' : $rank_info['rank_min'],
'IMAGE' => !empty($rank_info['rank_image']) ? $rank_info['rank_image'] : 'styles/images/ranks/rank_image.png',
'STYLE' => !empty($rank_info['rank_style']) ? $rank_info['rank_style'] : '',
'IMAGE_DISPLAY' => !empty($rank_info['rank_image']) ? '<img src="../' . $rank_info['rank_image'] . '" />' : '',
Expand All @@ -100,19 +89,12 @@
$rank_id = isset($_POST['id']) ? (int)$_POST['id'] : 0;
$rank_title = isset($_POST['title']) ? trim($_POST['title']) : '';
$rank_style = isset($_POST['style']) ? trim($_POST['style']) : '';
$special_rank = ($_POST['special_rank'] == 1) ? true : 0;
$min_posts = isset($_POST['min_posts']) ? (int)$_POST['min_posts'] : -1;
$rank_image = isset($_POST['rank_image']) ? trim($_POST['rank_image']) : '';

if ($rank_title == '') {
bb_die($lang['MUST_SELECT_RANK']);
}

if ($special_rank == 1) {
$max_posts = -1;
$min_posts = -1;
}

//
// The rank image has to be a jpg, gif or png
//
Expand All @@ -123,24 +105,22 @@
}

if ($rank_id) {
if (!$special_rank) {
$sql = 'UPDATE ' . BB_USERS . " SET user_rank = 0 WHERE user_rank = $rank_id";
if (!$result = DB()->sql_query($sql)) {
bb_die($lang['NO_UPDATE_RANKS']);
}

$sql = 'UPDATE ' . BB_USERS . " SET user_rank = 0 WHERE user_rank = $rank_id";
if (!$result = DB()->sql_query($sql)) {
bb_die($lang['NO_UPDATE_RANKS']);
}

$sql = 'UPDATE ' . BB_RANKS . "
SET rank_title = '" . DB()->escape($rank_title) . "',
rank_special = $special_rank,
rank_min = $min_posts,
rank_image = '" . DB()->escape($rank_image) . "',
rank_style = '" . DB()->escape($rank_style) . "'
WHERE rank_id = $rank_id";

$message = $lang['RANK_UPDATED'];
} else {
$sql = 'INSERT INTO ' . BB_RANKS . " (rank_title, rank_special, rank_min, rank_image, rank_style)
VALUES ('" . DB()->escape($rank_title) . "', $special_rank, $min_posts, '" . DB()->escape($rank_image) . "', '" . DB()->escape($rank_style) . "')";
$sql = 'INSERT INTO ' . BB_RANKS . " (rank_title, rank_image, rank_style)
VALUES ('" . DB()->escape($rank_title) . "', '" . DB()->escape($rank_image) . "', '" . DB()->escape($rank_style) . "')";

$message = $lang['RANK_ADDED'];
}
Expand Down Expand Up @@ -190,7 +170,7 @@
//
// Show the default page
//
$sql = 'SELECT * FROM ' . BB_RANKS . ' ORDER BY rank_min, rank_title';
$sql = 'SELECT * FROM ' . BB_RANKS . ' ORDER BY rank_title';
if (!$result = DB()->sql_query($sql)) {
bb_die('Could not obtain ranks data #2');
}
Expand All @@ -204,25 +184,15 @@

for ($i = 0; $i < $rank_count; $i++) {
$rank = $rank_rows[$i]['rank_title'];
$special_rank = $rank_rows[$i]['rank_special'];
$rank_id = $rank_rows[$i]['rank_id'];
$rank_min = $rank_rows[$i]['rank_min'];

if ($special_rank == 1) {
$rank_min = $rank_max = '-';
}

$row_class = !($i % 2) ? 'row1' : 'row2';

$rank_is_special = $special_rank ? $lang['YES'] : $lang['NO'];

$template->assign_block_vars('ranks', array(
'ROW_CLASS' => $row_class,
'RANK' => $rank,
'STYLE' => $rank_rows[$i]['rank_style'],
'IMAGE_DISPLAY' => $rank_rows[$i]['rank_image'] ? '<img src="../' . $rank_rows[$i]['rank_image'] . '" />' : '',
'SPECIAL_RANK' => $rank_is_special,
'RANK_MIN' => $rank_min,

'U_RANK_EDIT' => "admin_ranks.php?mode=edit&amp;id=$rank_id",
'U_RANK_DELETE' => "admin_ranks.php?mode=delete&amp;id=$rank_id",
Expand Down
4 changes: 2 additions & 2 deletions admin/admin_user_search.php
Expand Up @@ -55,7 +55,7 @@
}
}

$sql = 'SELECT * FROM ' . BB_RANKS . ' WHERE rank_special = 1 ORDER BY rank_title';
$sql = 'SELECT * FROM ' . BB_RANKS . ' ORDER BY rank_title';
if (!($result = DB()->sql_query($sql))) {
bb_die('Could not obtain ranks data');
}
Expand Down Expand Up @@ -482,7 +482,7 @@
bb_die($lang['SEARCH_INVALID_RANK']);
}

$sql = 'SELECT rank_title FROM ' . BB_RANKS . " WHERE rank_id = $rank_id AND rank_special = 1";
$sql = 'SELECT rank_title FROM ' . BB_RANKS . " WHERE rank_id = $rank_id";

if (!$result = DB()->sql_query($sql)) {
bb_die('Could not select rank data');
Expand Down
4 changes: 1 addition & 3 deletions install/sql/mysql.sql
Expand Up @@ -1032,8 +1032,6 @@ DROP TABLE IF EXISTS `bb_ranks`;
CREATE TABLE IF NOT EXISTS `bb_ranks` (
`rank_id` SMALLINT(5) UNSIGNED NOT NULL AUTO_INCREMENT,
`rank_title` VARCHAR(50) NOT NULL DEFAULT '',
`rank_min` MEDIUMINT(8) NOT NULL DEFAULT '0',
`rank_special` TINYINT(1) NOT NULL DEFAULT '1',
`rank_image` VARCHAR(255) NOT NULL DEFAULT '',
`rank_style` VARCHAR(255) NOT NULL DEFAULT '',
PRIMARY KEY (`rank_id`)
Expand All @@ -1044,7 +1042,7 @@ CREATE TABLE IF NOT EXISTS `bb_ranks` (
-- ----------------------------
-- Records of bb_ranks
-- ----------------------------
INSERT INTO `bb_ranks` VALUES ('', 'Администратор', '-1', '1', 'styles/images/ranks/admin.png', 'colorAdmin');
INSERT INTO `bb_ranks` VALUES ('', 'Администратор', 'styles/images/ranks/admin.png', 'colorAdmin');

-- ----------------------------
-- Table structure for `bb_search_rebuild`
Expand Down
4 changes: 4 additions & 0 deletions install/upgrade/changes.txt
Expand Up @@ -28,3 +28,7 @@ UPDATE `bb_sessions` SET `session_ip` = '0';
ALTER TABLE `bb_sessions` CHANGE `session_ip` `session_ip` varchar(42) NOT NULL DEFAULT '0';
UPDATE `bb_banlist` SET `ban_ip` = '0';
ALTER TABLE `bb_banlist` CHANGE `ban_ip` `ban_ip` varchar(42) NOT NULL DEFAULT '0';

// 2.2.2
ALTER TABLE `bb_ranks` DROP `rank_min`;
ALTER TABLE `bb_ranks` DROP `rank_special`;
3 changes: 0 additions & 3 deletions library/language/source/main.php
Expand Up @@ -1991,9 +1991,6 @@
$lang['RANK_TITLE'] = 'Rank Title';
$lang['STYLE_COLOR'] = 'Style rank';
$lang['STYLE_COLOR_FAQ'] = 'Specify class for painting at the title of the desired color. For example <i class="bold">colorAdmin<i>';
$lang['RANK_SPECIAL'] = 'Set as Special Rank';
$lang['RANK_MINIMUM'] = 'Minimum Posts';
$lang['RANK_MAXIMUM'] = 'Maximum Posts';
$lang['RANK_IMAGE'] = 'Rank Image';
$lang['RANK_IMAGE_EXPLAIN'] = 'Use this to define a small image associated with the rank';

Expand Down