fixed some minor bugs

ag/auktion.php

@@ -408,7 +408,7 @@ function stelleAuktionsuebersichtDar($userid,$kategorie,$itemnamepart,$entries,$
 				while($aktionentries[$index] != NULL){
 					echo "\t\t\t\t".'<tr>'."\n";
 					echo "\t\t\t\t\t".'<td height="31" valign="top" align="center">'.displayItemLink($aktionentries[$index]['tablename'], $aktionentries[$index]['itemid'], $aktionentries[$index]['itemname']).'</td>'."\n";
-					echo "\t\t\t\t\t".'<td height="31" valign="top" align="center">'.($aktionentries[$index]['tablename']==1?'Normal':'Inverse').'</td>'."\n";
+					echo "\t\t\t\t\t".'<td height="31" valign="top" align="center">'.($aktionentries[$index]['type']==1?'Normal':'Inverse').'</td>'."\n";
 					if($aktionentries[$index]['aktuellesgebot'] != NULL){
 						echo "\t\t\t\t\t".'<td height="31" valign="top" align="center">'.displayMoney($aktionentries[$index]['aktuellesgebot']).'</td>'."\n";
 					} else{

ag/clan/kampf_info.php

@@ -111,7 +111,7 @@ function denyChallenge($type, $clan_id, $user) {
 	}
 
 	if($success == null) {
-		displayClanFightMenu($user_ida);
+		displayClanFightMenu($user);
 	} else {
 		displayErrorMessage(NULL, $success, displayHistoryBackLink());
 		return;

ag/gm/include/item.inc.php

@@ -355,7 +355,7 @@ function displayItems($action, $task, $itemid, $itemtable, $searchstring, $s_ite
 				$desc_array = array('ID', 'Name', 'Bonus Stärke', 'Bonus Verteidigung', 'Bonus Geschwindigkeit', 'Bonus Ausdauer', 'Bonus HP', 'Bonus MP', 'Bonus Glück', 'Typ ("Teufels Frucht")', 'Preis', 'Anzahl', 'Verteilung (0=Nicht wünschbar, Summe Verteilung sollte 100 ergeben!!)', 'Kann bei Geheimauktion auftreten', 'Art (normal, natur)', 'Kategorie (Logia, Zoan, ...)','Infotext' );
 			} else {
 				$itemtable = 'item';
-				$d_array = array('id','name','hp','mp','starke','verteidigung','speed','s_type','preis','anzahl','type','level','info');
+				$d_array = array('id','name','hp','mp','starke','verteidigung','speed','s_type','preis','anzahl','rassen_type','level','info');
 				$desc_array = array('ID', 'Name', 'HP', 'MP', 'Stärke', 'Verteidigung', 'Geschwindigkeit', 'Art', 'Preis', 'Anzahl', 'Rassen', 'Level', 'Infotext');
 			}
 	

ag/gm/include/tournament.inc.php

@@ -14,7 +14,6 @@ defineIfNotDefined('TURNIER_WOCHENST_GEBUEHR', 50000);
 include_once(ROOT_PATH.'/include/tournament.inc.php');
 
 function persistTournamentChanges($request) {
-
 	$data = getTournamentType($request['id']);
 
 	$changes = array();
@@ -25,13 +24,19 @@ function persistTournamentChanges($request) {
 			} else {
 				$value = $request[$key];
 			}
+		} else {
+			$value = NULL;
 		}
 		
 		if ($key == 'id') {
 			continue;
-		} else if ($value == "") {
+		} else if ($value == "" || $value === NULL) {
+			if (strpos($key, 'excl_') === false) {
 				$changes[] = $key.' = NULL';	
-		} else if ($key == 'name' || $key == 'abbrevation' || $key == 'icon' || $key == 'fruit_type') {
+			} else {
+				$changes[] = $key.' = 0';	
+			}
+		} else if ($key == 'name' || $key == 'abbrevation' || $key == 'icon' || $key == 'fruit_type' || $key == 'icon') {
 			$changes[] = $key.'=\''.$value.'\'';
 		} else {
 			$changes[] = $key.'='.$value;
@@ -66,6 +71,18 @@ function displayTournamentForm($request, $data) {
 				<input type="text" name="name" value="<?php echo $form_data['name']; ?>" />
 			</td>
 		</tr>
+		<tr>
+			<td align="left">Abk&uuml;rzung:</td>
+			<td>
+				<input type="text" name="abbrevation" value="<?php echo $form_data['abbrevation']; ?>" />
+			</td>
+		</tr>
+		<tr>
+			<td align="left">Icon:</td>
+			<td>
+				<input type="text" name="icon" value="<?php echo $form_data['icon']; ?>" />
+			</td>
+		</tr>
 		<tr>
 			<td align="left">Teilnehmer:</td>
 			<td>

ag/include/clan_fights.inc.php

@@ -678,10 +678,7 @@ function joinChallenge($clan_challenge_id, array $user, $charid, $slot ) {
 		return 'Du kannst den Char nicht zuweisen, da die maximale Anzahl der erlaubten Zuweisungen ('.MAX_LEADER_ASSIGNED_CHARS.') schon erreicht ist!';
 	}
 	$sql = 'INSERT INTO clan_challenge_participants(clan_challenge_id, clan_id, char_id, slot, forced) values('.$clan_challenge_id.', '.$user['clan'].', '.$charid.', '.$slot.', ' .($forced?'TRUE':'FALSE') .')';
-	$res = db_query($sql);
+	$res = silent_query($sql);
-	if(!$res) {
-		echo $sql .'<br>';
-	}
 	if(db_affected_rows() == 0) {
 		if(!$forced) {
 			// maybe the leader has already assigned the char and we now give the official okay for that!

ag/index.php

@@ -80,14 +80,14 @@ if (top != self)
 							<div style="position:relative; top:0px; left:0px; z-index:1">
 								<img border="0" src="design/bilder/logos/logo.jpg" usemap="#FPMap0">
 							</div>
-							<div style="position:absolute; top:90px; left:275px; z-index:2">
+							<div style="position:absolute; top:90px; left:225px; z-index:2">
 								<a href="http://wiki.animegame.eu" target="_blank"><img border="0" src="design/bilder/buttons/test.jpg" ></a>
 							</div>
-							<div style="position:absolute; top:90px; left:355px; z-index:2">
+							<div style="position:absolute; top:90px; left:303px; z-index:2">
 								<a href="https://www.animegame.eu/game/blog" target="_blank"><img border="0" src="design/bilder/buttons/blog.jpg" ></a>
 							</div>
-							<div style="position:absolute; top:90px; left:435px; z-index:2">
+							<div style="position:absolute; top:90px; left:381px; z-index:2">
-								<a href="?as=tutorial"><img border="0" src="design/bilder/buttons/tutorial.jpg"></a>
+								<a href="?as=tutorial"><img border="0" src="design/bilder/buttons/tutorial.png"></a>
 							</div>
 						</div>