two small fixes

main
hecht 13 years ago
parent 6a1932ea54
commit a2dbb06584

@ -229,7 +229,7 @@ function displayShowChallenge($clan_challenge_id, $user) {
value='anmelden'></td> value='anmelden'></td>
</tr> </tr>
<?php if($authorized) { <?php if($authorized) {
$qry = db_query('SELECT user.id AS user_id, chars.id AS char_id, user.nickname AS user_name, chars.name AS char_name FROM user inner join chars on user.id = chars.besitzer where clan = 769 and user.id NOT IN (Select besitzer from chars inner join clan_challenge_participants on chars.id = clan_challenge_participants.char_id WHERE clan_challenge_id = '.$clan_challenge_id.' and clan_id = '.$user['clan'].')'); $qry = db_query('SELECT user.id AS user_id, chars.id AS char_id, user.nickname AS user_name, chars.name AS char_name FROM user inner join chars on user.id = chars.besitzer where clan = '.$user['clan'].' and user.id NOT IN (Select besitzer from chars inner join clan_challenge_participants on chars.id = clan_challenge_participants.char_id WHERE clan_challenge_id = '.$clan_challenge_id.' and clan_id = '.$user['clan'].')');
$users = array(); $users = array();
while($row = mysql_fetch_assoc($qry)) { while($row = mysql_fetch_assoc($qry)) {
if(!isset($users[$row['user_id']])){ if(!isset($users[$row['user_id']])){

@ -19,7 +19,7 @@ function getUser($userid, $buffer_enabled = true) {
} }
// Wenn Char nicht im Puffer ist, oder nicht gepuffert werden soll // Wenn Char nicht im Puffer ist, oder nicht gepuffert werden soll
if ($GLOBALS['user_buffered_instances'][$userid] == null || !$buffer_enabled) { if ($GLOBALS['user_buffered_instances'][$userid] == null || !$buffer_enabled) {
$user = mysql_fetch_assoc(db_query('SELECT *, online_zeit between TIMESTAMPADD(Minute, -15, now()) and now() as online FROM user WHERE id = '.$userid)); $user = mysql_fetch_assoc(db_query('SELECT *, (online_zeit between TIMESTAMPADD(Minute, -15, now()) and now()) as online FROM user WHERE id = '.$userid));
$GLOBALS['user_buffered_instances'][$userid] = $user; $GLOBALS['user_buffered_instances'][$userid] = $user;
} }
return $GLOBALS['user_buffered_instances'][$userid]; return $GLOBALS['user_buffered_instances'][$userid];

@ -302,7 +302,7 @@ function autokampf($user, $kampf_name, $char_id, $kampf_zeit, $lvl, $acceptWitho
} }
if($txt == NULL) { if($txt == NULL) {
$char = getChar($charid[$i]); $char = getChar($char_id[$i]);
$txt = $char['name']. ': Kampf wurde erfolgreich angenommen!'; $txt = $char['name']. ': Kampf wurde erfolgreich angenommen!';
} }

Loading…
Cancel
Save