diff --git a/handlers/matchhandler.php b/handlers/matchhandler.php
index 45a0897e..03dbf4fd 100644
--- a/handlers/matchhandler.php
+++ b/handlers/matchhandler.php
@@ -189,7 +189,7 @@ public static function setWinner($match, $clan) {
$mysql->query('UPDATE `' . Settings::db_table_infected_compo_participantOfMatch . '` SET `type` = 0, `participantId` = ' . $mysql->real_escape_string($clan->getId()) . ' WHERE `id` = ' . $row['id'] . ';');
$checkingMatchId = MatchHandler::getMatch($row['matchId']);
- ChatHandler::addClanMembersToChat($checkingMatchId->getChat(), $clan);
+ ChatHandler::addClanMembersToChat(ChatHandler::getChat($checkingMatchId->getChat()), $clan);
}
/*
$mysql->query('UPDATE `' . Settings::db_table_infected_compo_participantOfMatch . '`
@@ -213,7 +213,7 @@ public static function setWinner($match, $clan) {
$mysql->query('UPDATE `' . Settings::db_table_infected_compo_participantOfMatch . '` SET `type` = 0, `participantId` = ' . $mysql->real_escape_string($clan->getId()) . ' WHERE `id` = ' . $row['id'] . ';');
$checkingMatchId = MatchHandler::getMatch($row['matchId']);
- ChatHandler::addClanMembersToChat($checkingMatchId->getChat(), $clan);
+ ChatHandler::addClanMembersToChat(ChatHandler::getChat($checkingMatchId->getChat()), $clan);
}
/*$mysql->query('UPDATE `' . Settings::db_table_infected_compo_participantOfMatch . '`
diff --git a/pages/utils/verifyTicket.php b/pages/utils/verifyTicket.php
index 48495cbe..5ced27f1 100644
--- a/pages/utils/verifyTicket.php
+++ b/pages/utils/verifyTicket.php
@@ -14,7 +14,7 @@
$user = Session::getCurrentUser();
if ($user->hasPermission('*') ||
- $user->hasPermission('functions.checkin')) {
+ $user->hasPermission('event.checkin')) {
if (isset($_GET['id'])) {
$ticket = TicketHandler::getTicket($_GET['id']);
@@ -23,7 +23,7 @@
echo '$.getJSON(\'../../json/ticket/getTicketData.php?id=' . htmlentities($_GET['id'], ENT_QUOTES, 'UTF-8') . '\', function(data) {';
echo 'if (data.result) {';
echo 'var user = data.userData[0];';
- echo 'if (confirm(\'Sjekk at disse detaljene er riktige:\\nNavn: \' + user.firstname + \' \' + user.lastname + \'\\nKjønn: \' + user.gender + \'\\nFødt: \' + user.birthdate + \'\\nAlder: \' + user.age)) {';
+ echo 'if (confirm(\'Sjekk at disse detaljene er riktige:\\nNavn: \' + user.firstname + \' \' + user.lastname + \'\\nKjønn: \' + user.gender + \'\\nFødt: \' + user.birthdate + \'\\nAlder: \' + user.age + \'\\nAddresse: \' + user.address)) {';
echo '$.getJSON(\'../../json/ticket/checkInTicket.php?id=' . htmlentities($_GET['id'], ENT_QUOTES, 'UTF-8') . '\', function(data) {';
echo 'if(data.result) {';
echo 'alert(\'Brukeren har blitt sjekket inn!\');';
diff --git a/scripts/bracket.js b/scripts/bracket.js
index 1c253a0b..b4329f67 100644
--- a/scripts/bracket.js
+++ b/scripts/bracket.js
@@ -36,6 +36,7 @@ function updateBrackets() {
var currentOffset = 1;
var offsetCount = [0,0];
var cachedParentYPositions = [[], []];
+ var shouldMakeLoosersBracket = false;
var divHeights = [300, 0];
for(var x = 0; x < data.data.length; x++) {
@@ -49,9 +50,19 @@ function updateBrackets() {
'
' + data.data[x].startTime +
''
);
+ shouldMakeLoosersBracket = true;
} else {
offsetCount[data.data[x].bracket]++;
}
+ //Exra date handling for loosers bracket
+ if(shouldMakeLoosersBracket && data.data[x].bracket == 0) {
+ $("#" + currentBracket.divId).find("." + "loosersBracket").append(
+ '