Bug in Herausforderung-Anzeige gefixt

Tabellenrand bei NPC-Anzeige entfernt

ag/clan/kampf_info.php

@@ -109,6 +109,7 @@ function displayShowChallenge($clan_challenge_id, $user) {
 	$slots = array();
 
 	?>
+
 <form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="POST">
 	<input type="hidden" name="as" value=clan/kampf_info> <input
 		type="hidden" name="action" value="joinchallenge"> <input
@@ -333,19 +334,28 @@ function displayClanFightMenu($user) {
 			<td colspan="3">
 				<table width="100%" border="1">
 					<tr>
-						<th align="center" height="25">Herausforderer</th>
+						<th align="center" height="25">Clan</th>
 						<th align="center" height="25">Datum</th>
 						<th align="center" height="25">Typ</th>
 						<th align="center" height="25">Anzahl</th>
-						<th align="center" height="25">Option</th>
+						<th align="center" height="25">Status</th>
 					</tr>
 					<?php
 					foreach ($open_challenge_requests as $challenge) {
-						$clan = getClan($challenge['clan_requester']);
+						$requester_clan = getClan($challenge['clan_requester']);
-						echo '<tr><td align ="center">'.$clan['clanname'].'</td><td align ="center">'.formatTimestamp($challenge['challenged_time']).'</td>';
+						$challenged_clan = getClan($challenge['clan_challenged']);
+
+						//unterscheidung zwischen herausforder und herausgeforderter
+						if($user_clan['id'] == $challenge['clan_requester']) {
+							echo '<tr><td align ="center">'.$challenged_clan['clanname'].'</td><td align ="center">'.formatTimestamp($challenge['challenged_time']).'</td>';
+							echo '<td align ="center">'.getFightType($challenge['type']).'</td><td align ="center">'.$challenge['anzahl_chars'].'</td>';
+							echo '<td align ="center">ausstehend</td></tr>';
+						} else {
+							echo '<tr><td align ="center">'.$requester_clan['clanname'].'</td><td align ="center">'.formatTimestamp($challenge['challenged_time']).'</td>';
 							echo '<td align ="center">'.getFightType($challenge['type']).'</td><td align ="center">'.$challenge['anzahl_chars'].'</td>';
-						echo '<td align ="center"><a href="index.php?as=clan/kampf_info&action=acceptchallenge&clanid='.$clan['id'].'">annehmen</a> |';
+							echo '<td align ="center"><a href="index.php?as=clan/kampf_info&action=acceptchallenge&clanid='.$requester_clan['id'].'">annehmen</a> |';
-						echo '<a href="index.php?as=clan/kampf_info&action=q_denychallenge&clanid='.$clan['id'].'">ablehnen</a></td></tr>';
+							echo '<a href="index.php?as=clan/kampf_info&action=q_denychallenge&clanid='.$requester_clan['id'].'">ablehnen</a></td></tr>';
+						}
 					}
 					?>
 				</table>
@@ -356,7 +366,11 @@ function displayClanFightMenu($user) {
 		</tr>
 		<?php
 		if(count($open_challenge_ids) == 0) {
-                        ?><td height="20" colspan="2" align="center">Keine</td><?php
+			?>
+		<tr>
+			<td height="20" colspan="2" align="center">Keine</td>
+		</tr>
+		<?php
 		} else {
 			foreach ($open_challenge_ids as $oci) {
 				$participating_clan_ids = getParticipatingClanIDs($oci);
@@ -377,7 +391,9 @@ function displayClanFightMenu($user) {
 		<tr>
 		<?php
 		if(count($old_challenge_ids) == 0) {
-                        ?><td height="20" colspan="2" align="center">Keine</td><?php
+			?>
+			<td height="20" colspan="2" align="center">Keine</td>
+			<?php
 		} else {
 			foreach ($old_challenge_ids as $oci) {
 				$participating_clan_ids = getParticipatingClanIDs($oci);

ag/gm/include/npc.inc.php

@@ -325,7 +325,7 @@ function displayNPC($action, $task, $charid, $table, $page, $data, $att_ids){
 	echo '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">'."\n";
 	echo "\t".'<input type="hidden" name="choose" value="npc"></input>'."\n";
 	echo "\t".'<input type="hidden" name="charid" value="'.$charid.'"></input>'."\n";
-	echo "\t".'<table width="80%" border="1">'."\n";
+	echo "\t".'<table width="80%" border="0">'."\n";
 	if($action == ACTION_EDIT){
 		echo "\t".'<input type="hidden" name="action" value="'.ACTION_EDIT.'"></input>'."\n";
 		if($task == TASK_EDIT) {