Skip to content
Snippets Groups Projects
Commit 65400e88 authored by Joel Kuder's avatar Joel Kuder
Browse files

Merge branch 'patch-27' into 'dev-3.0'

Update rallysystem.php

See merge request !30
parents 9fce601c a07b7b3a
2 merge requests!46Release 3.0,!30Update rallysystem.php
...@@ -101,13 +101,17 @@ if (in_array($_SESSION['uid'], $gesperrt)) { ...@@ -101,13 +101,17 @@ if (in_array($_SESSION['uid'], $gesperrt)) {
} }
if ($_SESSION['login'] == 'true') { if ($_SESSION['login'] == 'true') {
$sql = sql::$db->query("SELECT punkte FROM "._VMS_."_rallyuser WHERE uid=" . $_SESSION['uid'] . " and rally = '" . $rallyname . "' LIMIT 1"); $sql = sql::$db->prepare("SELECT punkte FROM "._VMS_."_rallyuser WHERE uid=:session_uid AND rally = :rallyname LIMIT 1");
$sql -> bindParam(':session_uid', $_SESSION['uid'], PDO::PARAM_INT);
$sql -> bindParam(':rallyname', $rallyname, PDO::PARAM_STR);
$sql -> execute();
$rallystand = $sql->fetch(); $rallystand = $sql->fetch();
echo'<h2><font color="#010101">Du hast in der ' . $rallyname . '-Rally bereits ' . number_format($rallystand['punkte'], 0, ",", ".") . ' ' . $rally['ende_formulierung'] . '. (Danke)</font></h2><br>'; echo'<h2><font color="#010101">Du hast in der ' . $rallyname . '-Rally bereits ' . number_format($rallystand['punkte'], 0, ",", ".") . ' ' . $rally['ende_formulierung'] . '. (Danke)</font></h2><br>';
} }
if ($rally['ende_art'] == 'punkt') { if ($rally['ende_art'] == 'punkt') {
echo'Diese ' . $rallyname . '-Rally endet soball alle gemeinsam ' . $rally['ende_punkte'] . ' ' . $rally['ende_formulierung'] . ' haben.<br> '; echo'Diese ' . $rallyname . '-Rally endet sobald alle gemeinsam ' . $rally['ende_punkte'] . ' ' . $rally['ende_formulierung'] . ' haben.<br> ';
} elseif ($rally['ende_fortschritt'] == 'datum') { } elseif ($rally['ende_fortschritt'] == 'datum') {
echo'Diese ' . $rallyname . '-Rally endet am ' . date('j F Y G:i', $rally['ende_zeit']) . '<br>'; echo'Diese ' . $rallyname . '-Rally endet am ' . date('j F Y G:i', $rally['ende_zeit']) . '<br>';
} else { } else {
...@@ -143,7 +147,10 @@ echo ' ...@@ -143,7 +147,10 @@ echo '
</thead> </thead>
<tbody>'; <tbody>';
$platz = sql::$db->query ('SELECT k.punkte,u.nickname,u.uid FROM '._VMS_.'_rallyuser k LEFT JOIN '._VMS_.'_userdaten u ON u.uid = k.uid WHERE k.rally = "' . $rallyname . '" AND k.ausgezahlt = "0" ORDER BY k.punkte DESC'); $platz = sql::$db->prepare('SELECT k.punkte,u.nickname,u.uid FROM '._VMS_.'_rallyuser k LEFT JOIN '._VMS_.'_userdaten u ON u.uid = k.uid WHERE k.rally = :rallyname AND k.ausgezahlt = "0" ORDER BY k.punkte DESC');
$platz -> bindParam(':rallyname', $rallyname, PDO::PARAM_STR);
$platz -> execute();
$rp = 1; $rp = 1;
$gesperrt = explode(',', $rally['sperruser']); $gesperrt = explode(',', $rally['sperruser']);
while ($pa = $platz->fetch() ) { while ($pa = $platz->fetch() ) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment