diff --git a/ag/auktion.php b/ag/auktion.php
index c1c30e2..d8b7d5d 100644
--- a/ag/auktion.php
+++ b/ag/auktion.php
@@ -408,7 +408,7 @@ function stelleAuktionsuebersichtDar($userid,$kategorie,$itemnamepart,$entries,$
while($aktionentries[$index] != NULL){
echo "\t\t\t\t".''."\n";
echo "\t\t\t\t\t".'| '.displayItemLink($aktionentries[$index]['tablename'], $aktionentries[$index]['itemid'], $aktionentries[$index]['itemname']).' | '."\n";
- echo "\t\t\t\t\t".''.($aktionentries[$index]['tablename']==1?'Normal':'Inverse').' | '."\n";
+ echo "\t\t\t\t\t".''.($aktionentries[$index]['type']==1?'Normal':'Inverse').' | '."\n";
if($aktionentries[$index]['aktuellesgebot'] != NULL){
echo "\t\t\t\t\t".''.displayMoney($aktionentries[$index]['aktuellesgebot']).' | '."\n";
} else{
diff --git a/ag/clan/kampf_info.php b/ag/clan/kampf_info.php
index 0a64f43..d5914b8 100644
--- a/ag/clan/kampf_info.php
+++ b/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;
diff --git a/ag/gm/include/item.inc.php b/ag/gm/include/item.inc.php
index 59c61c7..0fa84b7 100644
--- a/ag/gm/include/item.inc.php
+++ b/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');
}
diff --git a/ag/gm/include/tournament.inc.php b/ag/gm/include/tournament.inc.php
index 3c46268..6f924ac 100644
--- a/ag/gm/include/tournament.inc.php
+++ b/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 == "") {
- $changes[] = $key.' = NULL';
- } else if ($key == 'name' || $key == 'abbrevation' || $key == 'icon' || $key == 'fruit_type') {
+ } else if ($value == "" || $value === NULL) {
+ if (strpos($key, 'excl_') === false) {
+ $changes[] = $key.' = NULL';
+ } 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) {
+
+ | Abkürzung: |
+
+
+ |
+
+
+ | Icon: |
+
+
+ |
+
| Teilnehmer: |
diff --git a/ag/include/clan_fights.inc.php b/ag/include/clan_fights.inc.php
index 6367963..e436ac6 100644
--- a/ag/include/clan_fights.inc.php
+++ b/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);
- if(!$res) {
- echo $sql .'
';
- }
+ $res = silent_query($sql);
if(db_affected_rows() == 0) {
if(!$forced) {
// maybe the leader has already assigned the char and we now give the official okay for that!
diff --git a/ag/index.php b/ag/index.php
index 82eb1dc..47a3b0c 100644
--- a/ag/index.php
+++ b/ag/index.php
@@ -80,14 +80,14 @@ if (top != self)
-
+
-
+
-
- 
+
+ 
|
- 
-