From b80441cf35b39eb15f24435533a6e4a8592cc6fb Mon Sep 17 00:00:00 2001
From: hecht <hecht@9a2b23b2-43f4-4935-bed2-871a584d7cab>
Date: Wed, 14 Dec 2011 22:20:36 +0000
Subject: [PATCH] updates for tickets

---
 ag/gm/gm_seite.php               | 6 ++++++
 ag/gm/include/tournament.inc.php | 6 +++---
 ag/include/halloffame.inc.php    | 1 +
 ag/turnier.php                   | 5 +++--
 cronjob/generic_turnier.php      | 4 +++-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ag/gm/gm_seite.php b/ag/gm/gm_seite.php
index 6aa740a..806edd0 100644
--- a/ag/gm/gm_seite.php
+++ b/ag/gm/gm_seite.php
@@ -151,11 +151,17 @@ function displayOptions(){
 					<a href="<?php echo $_SERVER['PHP_SELF']; ?>?choose=bann">Banns und andere unsch&ouml;ne Sachen</a>
 				</td>
 			</tr>
+			<?php
+			if($GLOBALS['URL_TO_TURNIER'] !== null) {
+			?>
 			<tr>
 				<td>
 					<a href="<?php echo $_SERVER['PHP_SELF']; ?>?choose=tournament">Turniere</a>
 				</td>
 			</tr>
+			<?php
+			}
+			?>
 			<tr>
 			<tr>
 				<td>
diff --git a/ag/gm/include/tournament.inc.php b/ag/gm/include/tournament.inc.php
index 65b1ebc..736df08 100644
--- a/ag/gm/include/tournament.inc.php
+++ b/ag/gm/include/tournament.inc.php
@@ -17,7 +17,7 @@ function displayTournamentOptions($action, $klein, $wochen) {
 	</tr>
 	<tr>
 		<td style="text-align: center">
-			<a href="<?php echo 'http://ag04.animegame.eu/ag_crond/generic_turnier.php?fusion='.$_POST['fusion'].'&special='.
+			<a href="<?php echo $GLOBALS['URL_TO_TURNIER'].'?fusion='.$_POST['fusion'].'&special='.
 			$_POST['special'].'&minlevel='.$_POST['minlevel'].'&maxlevel='.$_POST['maxlevel'].'&gain='.$_POST['gain'].'&randomize='.
 			$_POST['randomize'].'&name='.$_POST['name'].'&anzahl='.$_POST['anzahl'];?>"
 				target="_blank">Turnier starten!</a>
@@ -35,7 +35,7 @@ function displayTournamentOptions($action, $klein, $wochen) {
 	} elseif($action == 'tnmt') {
 		?>
 <form method="POST">
-	<input type="hidden" name="choose" value="tournament"> 
+	<input type="hidden" name="choose" value="tournament">
 	<input type="hidden" name="action" value="checktnmt">
 	<table width="80%">
 		<tr>
@@ -63,7 +63,7 @@ function displayTournamentOptions($action, $klein, $wochen) {
 					<option value="256">256</option>
 					<option value="512">512</option>
 			</select>
-		
+
 		</tr>
 		<tr>
 			<td>Fusion erlaubt?</td>
diff --git a/ag/include/halloffame.inc.php b/ag/include/halloffame.inc.php
index 208dac6..54e7268 100644
--- a/ag/include/halloffame.inc.php
+++ b/ag/include/halloffame.inc.php
@@ -71,6 +71,7 @@ function getHallOfFameEntryCountFull($round = '', $title = '', $userid = '') {
 		return 0;
 	}
 	$sql = 'SELECT COUNT(*) FROM highscore WHERE art=\''.$title.'\' AND runde='.$round.' AND userid='.$userid;
+//	echo $sql .'<br>';
 	$row = mysql_fetch_row(mysql_query($sql));
 	return $row[0];
 }
diff --git a/ag/turnier.php b/ag/turnier.php
index 3dbbbd9..852d189 100644
--- a/ag/turnier.php
+++ b/ag/turnier.php
@@ -93,6 +93,7 @@ function abmelden($user_ida, $char_id, $art){
 
 
 function displayDefault($user, $art){
+
 	if($art == 'klein'){
 		$turniername = 'Anf&auml;nger';
 		$special_clue = ' AND level<=25 AND fusion =\'nein\' AND char_type = \'\' ';
@@ -105,8 +106,8 @@ function displayDefault($user, $art){
 		return;
 	}
 	// sehr speziell und deswegen nicht getChar();
-	$sql = 'SELECT id, name, status FROM chars WHERE status=\'Frei\' AND besitzer='.$user['id'].$special_clue;
-//	echo $sql;
+	$sql = 'SELECT id, name FROM chars WHERE besitzer='.$user['id'].$special_clue;
+	echo $sql;
 	$char = mysql_query($sql);
 
 
diff --git a/cronjob/generic_turnier.php b/cronjob/generic_turnier.php
index 3c59c8e..2a7a952 100644
--- a/cronjob/generic_turnier.php
+++ b/cronjob/generic_turnier.php
@@ -153,7 +153,9 @@ if($gain == 'Anmeldung'){
 	while($row = mysql_fetch_assoc($qry)){
 		$cid[] = $row['id'];
 	}
-	mysql_query('DELETE FROM turnier1 WHERE art = \''.$name.'\''); // Lösche die Anmeldungsliste
+	$sql = 'DELETE FROM turnier1 WHERE art = \''.$name.'\'';
+//	echo $sql .'<br>';
+	mysql_query($sql); // Lösche die Anmeldungsliste
 	if(count($cid) > 0){
 		$sql = 'SELECT id FROM chars where '.$auswahl_kriteria.' and id NOT IN('.join(',',$cid).') ORDER BY RAND()';
 	} else {