Merge pull request #855 from hemberger/misc-changes

Miscellaneous changes
smrealms · May 26, 2020 · a2b7430 · a2b7430
2 parents 06aba05 + 7cb187d
commit a2b7430
Show file tree

Hide file tree

Showing 39 changed files with 92 additions and 58 deletions.
diff --git a/admin/Default/changelog_set_live_processing.php b/admin/Default/changelog_set_live_processing.php
@@ -5,9 +5,15 @@
 			WHERE version_id = ' . $db->escapeNumber($var['version_id'])
 		   );
 
+// Initialize the next version (since the version set live is not always the
+// last one, we INSERT IGNORE to skip this step in this case).
 $db->query('SELECT * FROM version WHERE version_id = ' . $db->escapeNumber($var['version_id']));
-$db->nextRecord();
+$db->requireRecord();
+$versionID = $db->getInt('version_id') + 1;
+$major = $db->getInt('major_version');
+$minor = $db->getInt('minor_version');
+$patch = $db->getInt('patch_level') + 1;
 $db->query('INSERT IGNORE INTO version (version_id, major_version, minor_version, patch_level, went_live) VALUES
-			('.$db->escapeNumber($db->getInt('version_id') + 1) . ',' . $db->escapeNumber($db->getInt('major_version')) . ',' . $db->escapeNumber($db->getInt('minor_version')) . ',' . $db->escapeNumber($db->getInt('patch_level') + 1) . ',0);');
+			('.$db->escapeNumber($versionID) . ',' . $db->escapeNumber($major) . ',' . $db->escapeNumber($minor) . ',' . $db->escapeNumber($patch) . ',0);');
 
 forward(create_container('skeleton.php', 'changelog.php'));
diff --git a/admin/Default/ip_view.php b/admin/Default/ip_view.php
@@ -2,7 +2,7 @@
 
 $template->assign('PageTopic', 'IP Search');
 $db->query('SELECT max(account_id) max_account_id FROM account');
-$db->nextRecord();
+$db->requireRecord();
 $template->assign('MaxAccountID', $db->getInt('max_account_id'));
 
 $template->assign('IpFormHref', SmrSession::getNewHREF(create_container('skeleton.php', 'ip_view_results.php')));
diff --git a/engine/Default/alliance_message_view.php b/engine/Default/alliance_message_view.php
@@ -54,7 +54,7 @@
 }
 
 $db->query('SELECT mb_messages FROM player_has_alliance_role JOIN alliance_has_roles USING(game_id,alliance_id,role_id) WHERE account_id = ' . $db->escapeNumber($player->getAccountID()) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND alliance_id=' . $db->escapeNumber($alliance->getAllianceID()) . ' LIMIT 1');
-$db->nextRecord();
+$db->requireRecord();
 $thread['CanDelete'] = $db->getBoolean('mb_messages');
 
 $db->query('SELECT text, sender_id, time, reply_id

diff --git a/engine/Default/alliance_mod.php b/engine/Default/alliance_mod.php
@@ -36,7 +36,7 @@
 // Does the player have edit permission?
 $role_id = $player->getAllianceRole($alliance->getAllianceID());
 $db->query('SELECT * FROM alliance_has_roles WHERE alliance_id = ' . $db->escapeNumber($player->getAllianceID()) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND role_id = ' . $db->escapeNumber($role_id));
-$db->nextRecord();
+$db->requireRecord();
 if ($db->getBoolean('change_mod') || $db->getBoolean('change_pass')) {
 	$container = create_container('skeleton.php', 'alliance_stat.php');
 	$container['alliance_id'] = $alliance->getAllianceID();

diff --git a/engine/Default/alliance_option.php b/engine/Default/alliance_option.php
@@ -25,7 +25,7 @@
 $role_id = $player->getAllianceRole($alliance->getAllianceID());
 
 $db->query('SELECT * FROM alliance_has_roles WHERE alliance_id = ' . $db->escapeNumber($player->getAllianceID()) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND role_id = ' . $db->escapeNumber($role_id));
-$db->nextRecord();
+$db->requireRecord();
 
 $container['url'] = 'skeleton.php';
 $container['alliance_id'] = $alliance->getAllianceID();

diff --git a/engine/Default/alliance_roster.php b/engine/Default/alliance_roster.php
@@ -46,7 +46,7 @@
 	GROUP BY alliance_id'
 );
 
-$db->nextRecord();
+$db->requireRecord();
 $template->assign('AllianceExp', $db->getInt('alliance_xp'));
 $template->assign('AllianceAverageExp', $db->getInt('alliance_avg'));
 

diff --git a/engine/Default/bank_alliance.php b/engine/Default/bank_alliance.php
@@ -52,7 +52,7 @@
 }
 
 $db->query('SELECT * FROM alliance_has_roles WHERE alliance_id = ' . $db->escapeNumber($alliance->getAllianceID()) . ' AND game_id = ' . $db->escapeNumber($alliance->getGameID()) . ' AND ' . $query);
-$db->nextRecord();
+$db->requireRecord();
 $template->assign('CanExempt', $db->getBoolean('exempt_with'));
 $withdrawalPerDay = $db->getInt('with_per_day');
 

diff --git a/engine/Default/bank_alliance_processing.php b/engine/Default/bank_alliance_processing.php
@@ -49,7 +49,7 @@
 		$query = 'role = ' . $db->escapeString($player->getAlliance()->getAllianceName());
 	}
 	$db->query('SELECT * FROM alliance_has_roles WHERE alliance_id = ' . $db->escapeNumber($alliance_id) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND ' . $query);
-	$db->nextRecord();
+	$db->requireRecord();
 	$withdrawalPerDay = $db->getInt('with_per_day');
 	if ($db->getBoolean('positive_balance')) {
 		$db->query('SELECT transaction, sum(amount) as total FROM alliance_bank_transactions

diff --git a/engine/Default/bank_anon_detail_processing.php b/engine/Default/bank_anon_detail_processing.php
@@ -28,7 +28,7 @@
 	$account->log(LOG_TYPE_BANK, 'Deposits ' . $amount . ' credits in anonymous account #' . $account_num, $player->getSectorID());
 } else {
 	$db->query('SELECT * FROM anon_bank WHERE anon_id = ' . $db->escapeNumber($account_num) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()));
-	$db->nextRecord();
+	$db->requireRecord();
 	if ($db->getInt('amount') < $amount) {
 		create_error('You don\'t have that much money on your account!');
 	}

diff --git a/engine/Default/bar_buy_drink_processing.php b/engine/Default/bar_buy_drink_processing.php
@@ -59,7 +59,7 @@
 
 	}
 	$db->query('SELECT count(*) FROM player_has_drinks WHERE game_id=' . $db->escapeNumber($player->getGameID()) . ' AND account_id=' . $db->escapeNumber($player->getAccountID()));
-	$db->nextRecord();
+	$db->requireRecord();
 	$num_drinks = $db->getInt('count(*)');
 	//display woozy message
 	$message .= '<br />You feel a little W' . str_repeat('oO', $num_drinks) . 'zy<br />';

diff --git a/engine/Default/bar_lotto_buy_processing.php b/engine/Default/bar_lotto_buy_processing.php
@@ -21,7 +21,7 @@
 $player->increaseHOF(1, array('Bar', 'Lotto', 'Tickets Bought'), HOF_PUBLIC);
 $db->query('SELECT count(*) as num FROM player_has_ticket WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . '
 	AND account_id = ' . $db->escapeNumber($player->getAccountID()) . ' AND time > 0 GROUP BY account_id');
-$db->nextRecord();
+$db->requireRecord();
 $num = $db->getInt('num');
 $message = ('<div class="center">Thanks for your purchase and good luck!  You currently');
 $message .= (' own ' . $num . ' ' . pluralise('ticket', $num) . '!</div><br />');

diff --git a/engine/Default/feature_request.php b/engine/Default/feature_request.php
@@ -112,6 +112,6 @@ function getFeaturesCount($status, $daysNew = false) {
 		AND status = ' . $db->escapeString($status) .
 		($daysNew ? ' AND EXISTS(SELECT posting_time FROM feature_request_comments WHERE feature_request_id = super.feature_request_id AND posting_time > ' . (TIME - $daysNew * 86400) . ')' : '')
 	);
-	$db->nextRecord();
+	$db->requireRecord();
 	return $db->getInt('count');
 }
diff --git a/engine/Default/galactic_post_delete_confirm.php b/engine/Default/galactic_post_delete_confirm.php
@@ -3,7 +3,7 @@
 if (isset($var['article'])) {
 	$template->assign('PageTopic', 'Delete Article - Confirm');
 	$db->query('SELECT * FROM galactic_post_article WHERE article_id = ' . $db->escapeNumber($var['id']) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()));
-	$db->nextRecord();
+	$db->requireRecord();
 	$template->assign('ArticleTitle', $db->getField('title'));
 	$container = create_container('galactic_post_delete_processing.php');
 	transfer('article');
@@ -13,7 +13,7 @@
 	// Delete paper
 	$template->assign('PageTopic', 'Delete Paper - Confirm');
 	$db->query('SELECT * FROM galactic_post_paper WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND paper_id = ' . $db->escapeNumber($var['id']));
-	$db->nextRecord();
+	$db->requireRecord();
 	$template->assign('PaperTitle', $db->getField('title'));
 
 	$articles = [];

diff --git a/engine/Default/galactic_post_paper_edit.php b/engine/Default/galactic_post_paper_edit.php
@@ -4,7 +4,7 @@
 Menu::galactic_post();
 
 $db->query('SELECT * FROM galactic_post_paper WHERE paper_id = ' . $db->escapeNumber($var['id']) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()));
-$db->nextRecord();
+$db->requireRecord();
 $template->assign('PaperTitle', bbifyMessage($db->getField('title')));
 
 $db->query('SELECT * FROM galactic_post_paper_content JOIN galactic_post_article USING (game_id, article_id) WHERE paper_id = ' . $db->escapeNumber($var['id']) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()));

diff --git a/engine/Default/galactic_post_read.php b/engine/Default/galactic_post_read.php
@@ -15,7 +15,7 @@
 	}
 
 	$db->query('SELECT * FROM galactic_post_paper WHERE game_id = ' . $db->escapeNumber($var['game_id']) . ' AND paper_id = ' . $var['paper_id']);
-	$db->nextRecord();
+	$db->requireRecord();
 	$paper_name = bbifyMessage($db->getField('title'));
 	$template->assign('PageTopic', 'Reading <i>Galactic Post</i> Edition : ' . $paper_name);
 

diff --git a/engine/Default/galactic_post_view_article.php b/engine/Default/galactic_post_view_article.php
@@ -29,7 +29,7 @@
 // Details about a selected article
 if (isset($var['id'])) {
 	$db->query('SELECT * FROM galactic_post_article WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND article_id = ' . $db->escapeNumber($var['id']));
-	$db->nextRecord();
+	$db->requireRecord();
 
 	$container = create_container('skeleton.php', 'galactic_post_write_article.php');
 	transfer('id');

diff --git a/engine/Default/galactic_post_write_article_processing.php b/engine/Default/galactic_post_write_article_processing.php
@@ -31,7 +31,7 @@
 	}
 
 	$db->query('SELECT MAX(article_id) article_id FROM galactic_post_article WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' LIMIT 1');
-	$db->nextRecord();
+	$db->requireRecord();
 	$num = $db->getInt('article_id') + 1;
 	$db->query('INSERT INTO galactic_post_article (game_id, article_id, writer_id, title, text, last_modified) VALUES (' . $db->escapeNumber($player->getGameID()) . ', ' . $db->escapeNumber($num) . ', ' . $db->escapeNumber($player->getAccountID()) . ', ' . $db->escapeString($title) . ' , ' . $db->escapeString($message) . ' , ' . $db->escapeNumber(TIME) . ')');
 	$db->query('UPDATE galactic_post_writer SET last_wrote = ' . $db->escapeNumber(TIME) . ' WHERE account_id = ' . $db->escapeNumber($account->getAccountID()));

diff --git a/engine/Default/history_alliance_detail.php b/engine/Default/history_alliance_detail.php
@@ -11,14 +11,16 @@
 $id = $var['alliance_id'];
 $db = new $var['HistoryDatabase']();
 $db->query('SELECT * FROM alliance WHERE alliance_id = ' . $db->escapeNumber($id) . ' AND game_id = ' . $db->escapeNumber($game_id));
-$db->nextRecord();
+$db->requireRecord();
 $template->assign('PageTopic', 'Alliance Roster - ' . htmlentities($db->getField('alliance_name')));
 
 //get alliance members
+$oldAccountID = $account->getOldAccountID($var['HistoryDatabase']);
 $db->query('SELECT * FROM player WHERE alliance_id = ' . $db->escapeNumber($id) . ' AND game_id = ' . $db->escapeNumber($game_id) . ' ORDER BY experience DESC');
 $players = [];
 while ($db->nextRecord()) {
 	$players[] = [
+		'bold' => $db->getInt('account_id') == $oldAccountID ? 'class="bold"' : '',
 		'player_name' => $db->getField('player_name'),
 		'experience' => number_format($db->getInt('experience')),
 		'alignment' => number_format($db->getInt('alignment')),

diff --git a/engine/Default/history_games.php b/engine/Default/history_games.php
@@ -12,7 +12,7 @@
 $db = new $var['HistoryDatabase']();
 $db->query('SELECT start_date, type, end_date, game_name, speed, game_id ' .
            'FROM game WHERE game_id = ' . $db->escapeNumber($game_id));
-$db->nextRecord();
+$db->requireRecord();
 $template->assign('GameName', $game_name);
 $template->assign('Start', date(DATE_DATE_SHORT, $db->getInt('start_date')));
 $template->assign('End', date(DATE_DATE_SHORT, $db->getInt('end_date')));
@@ -28,13 +28,19 @@
 	$template->assign('MaxKills', $db->getInt('max(kills)'));
 }
 $db->query('SELECT count(*) FROM alliance WHERE game_id = ' . $db->escapeNumber($game_id));
-$db->nextRecord();
+$db->requireRecord();
 $template->assign('NumAlliances', $db->getInt('count(*)'));
 
+// Get linked player information, if available
+$oldAccountID = $account->getOldAccountID($var['HistoryDatabase']);
+$db->query('SELECT alliance_id FROM player WHERE game_id = ' . $db->escapeNumber($game_id) . ' AND account_id = ' . $db->escapeNumber($oldAccountID));
+$oldAllianceID = $db->nextRecord() ? $db->getInt('alliance_id') : 0;
+
 $playerExp = [];
 $db->query('SELECT * FROM player WHERE game_id = ' . $db->escapeNumber($game_id) . ' ORDER BY experience DESC LIMIT 10');
 while ($db->nextRecord()) {
 	$playerExp[] = [
+		'bold' => $db->getInt('account_id') == $oldAccountID ? 'class="bold"' : '',
 		'exp' => $db->getInt('experience'),
 		'name' => stripslashes($db->getField('player_name')),
 	];
@@ -45,6 +51,7 @@
 $db->query('SELECT * FROM player WHERE game_id = ' . $db->escapeNumber($game_id) . ' ORDER BY kills DESC LIMIT 10');
 while ($db->nextRecord()) {
 	$playerKills[] = [
+		'bold' => $db->getInt('account_id') == $oldAccountID ? 'class="bold"' : '',
 		'kills' => $db->getInt('kills'),
 		'name' => stripslashes($db->getField('player_name')),
 	];
@@ -65,6 +72,7 @@
 	$id = $db->getInt('alliance_id');
 	$container['alliance_id'] = $id;
 	$allianceExp[] = [
+		'bold' => $db->getInt('alliance_id') == $oldAllianceID ? 'class="bold"' : '',
 		'exp' => $db->getInt('exp'),
 		'link' => create_link($container, $alliance),
 	];
@@ -78,6 +86,7 @@
 	$id = $db->getInt('alliance_id');
 	$container['alliance_id'] = $id;
 	$allianceKills[] = [
+		'bold' => $db->getInt('alliance_id') == $oldAllianceID ? 'class="bold"' : '',
 		'kills' => $db->getInt('kills'),
 		'link' => create_link($container, $alliance),
 	];

diff --git a/engine/Default/message_view.php b/engine/Default/message_view.php
@@ -95,11 +95,11 @@
 		$db->query('SELECT count(*) as count
 					FROM message ' . $whereClause . '
 						AND msg_read = ' . $db->escapeBoolean(false));
-		$db->nextRecord();
+		$db->requireRecord();
 		$messageBox['UnreadMessages'] = $db->getInt('count');
 	}
 	$db->query('SELECT count(*) as count FROM message ' . $whereClause);
-	$db->nextRecord();
+	$db->requireRecord();
 	$messageBox['TotalMessages'] = $db->getInt('count');
 	$messageBox['Type'] = $var['folder_id'];
 

diff --git a/engine/Default/planet_land_processing.php b/engine/Default/planet_land_processing.php
@@ -23,7 +23,7 @@
 if ($player->hasAlliance()) {
 	$role_id = $player->getAllianceRole();
 	$db->query('SELECT * FROM alliance_has_roles WHERE alliance_id = ' . $db->escapeNumber($player->getAllianceID()) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND role_id = ' . $db->escapeNumber($role_id));
-	$db->nextRecord();
+	$db->requireRecord();
 	if (!$db->getBoolean('planet_access')) {
 		if ($planet->hasOwner() && $planet->getOwnerID() != $player->getAccountID()) {
 			create_error('Your alliance doesn\'t allow you to dock at their planet.');

diff --git a/engine/Default/planet_list_financial.php b/engine/Default/planet_list_financial.php
@@ -14,7 +14,7 @@
 		AND game_id = ' . $db->escapeNumber($player->getGameID()) . '
 		AND role_id = ' . $db->escapeNumber($role_id)
 	);
-	$db->nextRecord();
+	$db->requireRecord();
 	$viewBonds = $db->getBoolean('view_bonds');
 }
 $template->assign('CanViewBonds', $viewBonds);

diff --git a/engine/Default/rankings_alliance_death.php b/engine/Default/rankings_alliance_death.php
@@ -4,7 +4,7 @@
 
 $db->query('SELECT count(*) FROM alliance
 			WHERE game_id = ' . $db->escapeNumber($player->getGameID()));
-$db->nextRecord();
+$db->requireRecord();
 $numAlliances = $db->getInt('count(*)');
 
 $ourRank = 0;
@@ -19,7 +19,7 @@
 						AND alliance_name <= ' . $db->escapeString($player->getAlliance()->getAllianceName()) . '
 					)
 				)');
-	$db->nextRecord();
+	$db->requireRecord();
 	$ourRank = $db->getInt('count(*)');
 	$template->assign('OurRank', $ourRank);
 }

diff --git a/engine/Default/rankings_alliance_experience.php b/engine/Default/rankings_alliance_experience.php
@@ -4,7 +4,7 @@
 
 $db->query('SELECT count(*) FROM alliance
 			WHERE game_id = ' . $db->escapeNumber($player->getGameID()));
-$db->nextRecord();
+$db->requireRecord();
 $numAlliances = $db->getInt('count(*)');
 
 $ourRank = 0;
@@ -30,7 +30,7 @@
 						AND alliance_name <= ' . $db->escapeString($player->getAlliance()->getAllianceName()) . '
 					)
 				)');
-	$db->nextRecord();
+	$db->requireRecord();
 	$ourRank = $db->getInt('count(*)');
 	$template->assign('OurRank', $ourRank);
 }

diff --git a/engine/Default/rankings_alliance_kills.php b/engine/Default/rankings_alliance_kills.php
@@ -4,7 +4,7 @@
 
 $db->query('SELECT count(*) FROM alliance
 			WHERE game_id = ' . $db->escapeNumber($player->getGameID()));
-$db->nextRecord();
+$db->requireRecord();
 $numAlliances = $db->getInt('count(*)');
 
 $ourRank = 0;
@@ -19,7 +19,7 @@
 						AND alliance_name <= ' . $db->escapeString($player->getAlliance()->getAllianceName()) . '
 					)
 				)');
-	$db->nextRecord();
+	$db->requireRecord();
 	$ourRank = $db->getInt('count(*)');
 	$template->assign('OurRank', $ourRank);
 }

diff --git a/engine/Default/rankings_alliance_profit.php b/engine/Default/rankings_alliance_profit.php
@@ -4,7 +4,7 @@
 
 $db->query('SELECT count(*) FROM alliance
 			WHERE game_id = ' . $db->escapeNumber($player->getGameID()));
-$db->nextRecord();
+$db->requireRecord();
 $numAlliances = $db->getInt('count(*)');
 $profitType = array('Trade', 'Money', 'Profit');
 $profitTypeEscaped = $db->escapeArray($profitType, false, true, ':', false);
@@ -34,7 +34,7 @@
 						AND alliance_name <= ' . $db->escapeString($player->getAlliance()->getAllianceName()) . '
 					)
 				)');
-	$db->nextRecord();
+	$db->requireRecord();
 	$ourRank = $db->getInt('count(*)');
 	$template->assign('OurRank', $ourRank);
 }

diff --git a/engine/Default/rankings_player_profit.php b/engine/Default/rankings_player_profit.php
@@ -19,7 +19,7 @@
 					AND player_name <= ' . $db->escapeString($player->getPlayerName()) . '
 				)
 			)');
-$db->nextRecord();
+$db->requireRecord();
 $ourRank = $db->getInt('count(*)');
 $template->assign('OurRank', $ourRank);
 

diff --git a/engine/Default/trader_savings.php b/engine/Default/trader_savings.php
@@ -20,13 +20,13 @@
 
 // Number of active lotto tickets this player has
 $db->query('SELECT count(*) FROM player_has_ticket WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND account_id = ' . $db->escapeNumber($player->getAccountID()) . ' AND time > 0');
-$db->nextRecord();
+$db->requireRecord();
 $tickets = $db->getInt('count(*)');
 $template->assign('LottoTickets', $tickets);
 
 // Number of active lotto tickets all players have
 $db->query('SELECT count(*) FROM player_has_ticket WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND time > 0');
-$db->nextRecord();
+$db->requireRecord();
 $tickets_tot = $db->getInt('count(*)');
 if ($tickets == 0) {
 	$win_chance = 0;
@@ -37,5 +37,5 @@
 
 // Number of winning lotto tickets this player has to claim
 $db->query('SELECT count(*) FROM player_has_ticket WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND account_id = ' . $db->escapeNumber($player->getAccountID()) . ' AND time = 0');
-$db->nextRecord();
+$db->requireRecord();
 $template->assign('WinningTickets', $db->getInt('count(*)'));
diff --git a/engine/Default/trader_status.php b/engine/Default/trader_status.php
@@ -20,7 +20,7 @@
 $template->assign('BountiesHREF', SmrSession::getNewHREF($container));
 
 $db->query('SELECT count(*) FROM bounty WHERE claimer_id=' . $db->escapeNumber($player->getAccountID()) . ' AND game_id=' . $db->escapeNumber($player->getGameID()));
-$db->nextRecord();
+$db->requireRecord();
 $template->assign('BountiesClaimable', $db->getInt('count(*)'));
 
 // Ship
@@ -51,7 +51,7 @@
 $db->query('SELECT level_name,requirement FROM level WHERE requirement>' . $db->escapeNumber($player->getExperience()) . ' ORDER BY requirement ASC LIMIT 1');
 if (!$db->nextRecord()) {
 	$db->query('SELECT level_name,requirement FROM level ORDER BY requirement DESC LIMIT 1');
-	$db->nextRecord();
+	$db->requireRecord();
 }
 $template->assign('NextLevelName', $db->getField('level_name'));