Digitalstack/ZnoteAAC
2
0
Fork 0
mirror of https://github.com/Znote/ZnoteAAC.git synced 2025-04-30 03:09:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: Error appearing when no news, username already exist error when creating account TFS 1.0

Browse Source
This commit is contained in:
Stefan Brannfjell 2014-02-08 14:09:54 +01:00
parent 801e0bcbef
commit 87d09ebe67
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engine/function/users.php
View File

@ -150,11 +150,15 @@ function support_list() {
// NEWS // NEWS
function fetchAllNews() { function fetchAllNews() {
$data = mysql_select_multi("SELECT * FROM `znote_news` ORDER BY `id` DESC;"); $data = mysql_select_multi("SELECT * FROM `znote_news` ORDER BY `id` DESC;");
if ($data !== false) {
for ($i = 0; $i < count($data); $i++) { for ($i = 0; $i < count($data); $i++) {
$cd = user_character_data($data[$i]['pid'], 'name'); $player = mysql_select_single("SELECT `name` FROM `players` WHERE `id`='".$data[$i]['pid']."' LIMIT 1;");
$data[$i]['name'] = $cd['name']; if ($player !== false) $data[$i]['name'] = $player['name'];
else $data[$i]['name'] = "Player not found.";
unset($data[$i]['pid']); unset($data[$i]['pid']);
} }
}
return $data; return $data;
} }
@ -1183,7 +1187,7 @@ function user_create_character($character_data) {
$fields_sql = implode("`, `", $fields); // Convert array into SQL compatible string $fields_sql = implode("`, `", $fields); // Convert array into SQL compatible string
$data_sql = implode("', '", $data); // Convert array into SQL compatible string $data_sql = implode("', '", $data); // Convert array into SQL compatible string
echo 1; echo 1;
mysql_insert("INSERT INTO `players`(`$fields_sql`) VALUES ('$data_sql');") or die("INSERT ERROR: ". mysql_error()); mysql_insert("INSERT INTO `players`(`$fields_sql`) VALUES ('$data_sql');");
$created = time(); $created = time();
$charid = user_character_id($import_data['name']); $charid = user_character_id($import_data['name']);
@ -1340,7 +1344,7 @@ function user_activated($username) {
// Checks that username exist in database // Checks that username exist in database
function user_exist($username) { function user_exist($username) {
$username = sanitize($username); $username = sanitize($username);
$data = mysql_select_single("SELECT COUNT('id') FROM `accounts` WHERE `name`='$username';"); $data = mysql_select_single("SELECT `id` FROM `accounts` WHERE `name`='$username';");
return ($data !== false) ? true : false; return ($data !== false) ? true : false;
} }

9
myaccount.php
View File

@ -29,12 +29,21 @@ if (!empty($_POST['selected_delete'])) {
} }
if (user_character_account_id($_POST['selected_delete']) === $session_user_id) { if (user_character_account_id($_POST['selected_delete']) === $session_user_id) {
$charid = user_character_id($_POST['selected_delete']); $charid = user_character_id($_POST['selected_delete']);
if ($charid !== false) {
if ($config['TFSVersion'] === 'TFS_10') {
if (!user_is_online_10($charid)) {
if (guild_leader_gid($charid) === false) user_delete_character($charid);
else echo 'Character is leader of a guild, you must disband the guild or change leadership before deleting character.';
} echo 'Character must be offline first.';
} else {
$chr_data = user_character_data($charid, 'online'); $chr_data = user_character_data($charid, 'online');
if ($chr_data['online'] != 1) { if ($chr_data['online'] != 1) {
if (guild_leader_gid($charid) === false) user_delete_character($charid); if (guild_leader_gid($charid) === false) user_delete_character($charid);
else echo 'Character is leader of a guild, you must disband the guild or change leadership before deleting character.'; else echo 'Character is leader of a guild, you must disband the guild or change leadership before deleting character.';
} else echo 'Character must be offline first.'; } else echo 'Character must be offline first.';
} }
}
}
} }
// end // end
// Change character sex // Change character sex