diff --git a/ag/event_abholen.php b/ag/event_abholen.php index 9ab08be..ba4d3d1 100644 --- a/ag/event_abholen.php +++ b/ag/event_abholen.php @@ -10,17 +10,28 @@ include_once (ROOT_PATH . '/include/config.inc.php'); include_once (ROOT_PATH . '/include/char.inc.php'); include_once (ROOT_PATH . '/include/event.inc.php'); include_once (ROOT_PATH . '/include/parse.inc.php'); - +?> + + + + + + \ No newline at end of file +?> + + \ No newline at end of file diff --git a/ag/event_kampf_anzeige.php b/ag/event_kampf_anzeige.php index 9bc55a0..7df561b 100644 --- a/ag/event_kampf_anzeige.php +++ b/ag/event_kampf_anzeige.php @@ -5,6 +5,13 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GNU General Public Licence * */ +?> + + + + + +'; } -?> \ No newline at end of file +?> + + \ No newline at end of file diff --git a/ag/include/clan_fights.inc.php b/ag/include/clan_fights.inc.php index 82cbb7b..b46d22e 100644 --- a/ag/include/clan_fights.inc.php +++ b/ag/include/clan_fights.inc.php @@ -365,6 +365,14 @@ function getHistoricalChallengeIDs($clanid, $limit = NULL) { return $array; } +function getClanLockedTime($clan_id) { + $sql = 'SELECT TIMESTAMPDIFF(SECOND, NOW(), locked_until) FROM clan_locked WHERE clanid = ' . $clan_id; + $row = mysql_fetch_row(mysql_query($sql)); + if($row) + return $row[0]; + return 0; +} + // Checks if the clan is locked, will lock it if required! function isClanLocked($clanid) { if(!is_numeric($clanid)) { @@ -804,6 +812,7 @@ function getCountLeaderAssignedChars($clan_id, $clan_fight_id) { return $row[0]; } + /** * This function checks if there is a char-rule that allows forcing the char for leader assignment! * @param int $char_id diff --git a/ag/include/designfunctions.inc.php b/ag/include/designfunctions.inc.php index a39e1a4..0c94884 100644 --- a/ag/include/designfunctions.inc.php +++ b/ag/include/designfunctions.inc.php @@ -164,4 +164,49 @@ function displayCount($value){ return number_format($value,0,'','.'); } +function generateTimerHtml($timerId, $timeInSeconds, $htmlOnExpire) { + ?> +
+ + + +
+ diff --git a/ag/include/kampf_anzeige.inc.php b/ag/include/kampf_anzeige.inc.php index 9779aee..33860d5 100644 --- a/ag/include/kampf_anzeige.inc.php +++ b/ag/include/kampf_anzeige.inc.php @@ -365,7 +365,7 @@ function displayEventFight($event_id, $event_fight_id) { include_once(ROOT_PATH.'/include/event.inc.php'); // for the defines :) // Erstmal die Seite starten - echo ''; + echo '
'; // :D // first readout the required event data $sql = 'SELECT *, visible <= now() as passed FROM event_fights WHERE event_id = ' . $event_id . ' AND event_fight_id = ' . $event_fight_id . ' AND `starting` <= now()'; @@ -427,7 +427,7 @@ function displayEventFight($event_id, $event_fight_id) { echo ''; - echo '
 
'; + echo ''; return null; }