From 5f0db62c1aa2d8023ebef294d12b8999a44ec739 Mon Sep 17 00:00:00 2001 From: hecht Date: Thu, 20 Oct 2016 19:59:29 +0000 Subject: [PATCH] checkin anpassungen der aktuellen runde --- ag/char_profil.php | 4 ++-- ag/include/attackenset.inc.php | 7 +++++-- ag/include/clan_fights.inc.php | 4 ++-- ag/include/kampf_wrapper.inc.php | 6 +++++- ag/include/parse.inc.php | 3 ++- ag/include/schatz.inc.php | 11 ++++++++--- ag/irc.php | 4 ++-- ag/rss.php | 5 +++-- ag/schatz.php | 1 - ag/sets.php | 2 +- 10 files changed, 30 insertions(+), 17 deletions(-) diff --git a/ag/char_profil.php b/ag/char_profil.php index 92a5735..79752f0 100644 --- a/ag/char_profil.php +++ b/ag/char_profil.php @@ -210,7 +210,7 @@ function stelledar($char_id,$user_ida,$name) { Normale Kämpfe - Clankämpfe + Schatzsuche \ No newline at end of file +?> diff --git a/ag/include/attackenset.inc.php b/ag/include/attackenset.inc.php index 926acdc..1e34eb9 100644 --- a/ag/include/attackenset.inc.php +++ b/ag/include/attackenset.inc.php @@ -7,6 +7,8 @@ */ include_once (ROOT_PATH.'/include/defines.inc.php'); +include_once (ROOT_PATH.'/include/sqlwrapper.inc.php'); + //Set-Arten defineIfNotDefined('NORMALKAMPF', 1); @@ -44,8 +46,9 @@ function getAttackSet($char_id, $type) { if(!is_numeric($char_id) || !is_numeric($type)) { return false; } - $qry = mysql_query('SELECT attack_id, round FROM attackenset WHERE char_id = '.$char_id.' AND type = '.$type); + $qry = db_query('SELECT attack_id, round FROM attackenset WHERE char_id = '.$char_id.' AND type = '.$type); + $set = array(); while ($result = mysql_fetch_assoc($qry)) { $set[$result['round']] = $result['attack_id']; } @@ -141,4 +144,4 @@ function validateAttackSet($attackSet) { return NULL; } -?> \ No newline at end of file +?> diff --git a/ag/include/clan_fights.inc.php b/ag/include/clan_fights.inc.php index a8bf4cc..e543d00 100644 --- a/ag/include/clan_fights.inc.php +++ b/ag/include/clan_fights.inc.php @@ -28,8 +28,8 @@ defineIfNotDefined('DURATION_SURVIVAL_FIGHT', 15); defineIfNotDefined('MAX_COUNT_PARALLEL_CFS', 1); -defineIfNotDefined('ATTACK_SET_DAVY_BACK_FIGHT', 2); -defineIfNotDefined('ATTACK_SET_SURVIVAL', 2); +defineIfNotDefined('ATTACK_SET_DAVY_BACK_FIGHT', 1); +defineIfNotDefined('ATTACK_SET_SURVIVAL', 1); defineIfNotDefined('CLAN_EXP_FAKTOR_G', 1); diff --git a/ag/include/kampf_wrapper.inc.php b/ag/include/kampf_wrapper.inc.php index 8d8db5e..1e73e4f 100644 --- a/ag/include/kampf_wrapper.inc.php +++ b/ag/include/kampf_wrapper.inc.php @@ -7,7 +7,7 @@ */ include_once (ROOT_PATH . '/include/arena.inc.php'); - +include_once (ROOT_PATH . '/include/sqlwrapper.inc.php'); /** * @@ -17,9 +17,13 @@ include_once (ROOT_PATH . '/include/arena.inc.php'); */ function convertLearnIDToAttackID (array $learnids, $char_id) { $result = array(); + $sql = 'SELECT id, at_id FROM lernen WHERE id IN ('.implode(',', $learnids).') AND besitzer = ' . $char_id; // echo $sql .'
'; $qry = mysql_query($sql); + if (!$qry) { + return array(); + } while($row = mysql_fetch_assoc($qry)) { for($i=0;$i'; + echo ''; } else { - echo ''; + echo ''; } diff --git a/ag/rss.php b/ag/rss.php index c4c2ea0..ad53211 100644 --- a/ag/rss.php +++ b/ag/rss.php @@ -25,13 +25,14 @@ $nachrichten = mysql_query('SELECT * FROM ff11_news order by id DESC LIMIT 10'); { $komments = mysql_fetch_assoc(mysql_query('SELECT count(id) as anzahl FROM ff11_komments WHERE news_id='.$row['id'])); $komments = $komments['anzahl']; - $text = htmlspecialchars($row['text']); + $betreff = preg_replace('#&#', 'und', $row['betreff']); + $text = $betreff;//htmlspecialchars($row['text']); $link = $GLOBALS['server_url_long'].'/index.php?as=news&id='.$row['id'].''; $link = htmlentities($link); ?> - <?php echo preg_replace('#&#', 'und', $row['betreff']).' - Antworten ('.$komments.')'; ?> + <?php echo $betreff.' - Antworten ('.$komments.')'; ?> diff --git a/ag/schatz.php b/ag/schatz.php index 3d7e794..d141560 100644 --- a/ag/schatz.php +++ b/ag/schatz.php @@ -70,7 +70,6 @@ $coords[0] = $char_ort['x_coord']; $coords[1] = $char_ort['y_coord']; if ($charm == 1) { - if (!semaphoreUP($ressource)) { // Blockiere alle Aktionen die der User gleichzeitig ausfuehren will (Ausgaben, Chars etc.) um Problemen vorzubeugen!! displayErrorMessage(NULL, 'Verarbeitung gerade in Gange, bitte warten...', displayHistoryBackLink()); exit; diff --git a/ag/sets.php b/ag/sets.php index 5263439..a8d2306 100644 --- a/ag/sets.php +++ b/ag/sets.php @@ -117,7 +117,7 @@ function displaySets($user_ida) { - +