From a2dbb06584e641866036562726d6ebcfc1d6551e Mon Sep 17 00:00:00 2001
From: hecht <hecht@9a2b23b2-43f4-4935-bed2-871a584d7cab>
Date: Fri, 20 Jan 2012 19:00:27 +0000
Subject: [PATCH] two small fixes

---
 ag/clan/kampf_info.php  | 2 +-
 ag/include/user.inc.php | 2 +-
 ag/kampf_list.php       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ag/clan/kampf_info.php b/ag/clan/kampf_info.php
index 77d6d81..12955ad 100644
--- a/ag/clan/kampf_info.php
+++ b/ag/clan/kampf_info.php
@@ -229,7 +229,7 @@ function displayShowChallenge($clan_challenge_id, $user) {
 				value='anmelden'></td>
 		</tr>
 		<?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();
 			while($row = mysql_fetch_assoc($qry)) {
 				if(!isset($users[$row['user_id']])){
diff --git a/ag/include/user.inc.php b/ag/include/user.inc.php
index 6d4b579..589f680 100644
--- a/ag/include/user.inc.php
+++ b/ag/include/user.inc.php
@@ -19,7 +19,7 @@ function getUser($userid, $buffer_enabled = true) {
 	}
 	// 	Wenn Char nicht im Puffer ist, oder nicht gepuffert werden soll
 	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;
 	}
 	return $GLOBALS['user_buffered_instances'][$userid];
diff --git a/ag/kampf_list.php b/ag/kampf_list.php
index 9ace299..7023e58 100644
--- a/ag/kampf_list.php
+++ b/ag/kampf_list.php
@@ -302,7 +302,7 @@ function autokampf($user, $kampf_name, $char_id, $kampf_zeit, $lvl, $acceptWitho
 				}
 
 				if($txt == NULL) {
-					$char = getChar($charid[$i]);
+					$char = getChar($char_id[$i]);
 					$txt = $char['name']. ': Kampf wurde erfolgreich angenommen!';
 				}