Tsar_Lyagushka/HB
1
0
Fork 0
forked from halo-battle/game
Code Issues Pull requests Projects Releases Wiki Activity

Ajout d'une étape de linting dans DroneCi (#3)

Browse source 
Corrige un doublons laissé par le rebase semi-manuel

Ajout d'une étape de linting dans DroneCi

Fix linting

Co-authored-by: Nigel Sheldon <nigelsheldon@live.fr>
Reviewed-on: https://gitea.nemunai.re/halo-battle/game/pulls/3
This commit is contained in:
Nigel 2020-11-21 18:54:32 +00:00
commit dd61d3b66b
263 changed files with 45327 additions and 42695 deletions
Download patch file Download diff file Expand all files Collapse all files

54
htdocs/ajax_chat.php
View file

@ -13,36 +13,30 @@ require_once("donnees.php");
$SESS = new Session();
//On vérifie si le client est connecté sur le site
if (isset($SESS) && isset($SESS->values['connected']) && $SESS->values['connected'] && !empty($SESS->values['id']) && !empty($SESS->values['race']) && !empty($SESS->level) && isset($SESS->values['idPlan']) && isset($SESS->values['idAsteroide']))
{
include_once("Class/user.php");
$user = new User($SESS->values['id']);
if (!empty($user->id_alliance))
{
if (isset($_POST['message']))
{
$message = htmlentities(trim(gpc("message", "post")));
if (!empty($message) || $message == "0")
{
$bdd = new BDD();
$bdd->escape($message);
$bdd->query("INSERT INTO $table_alliances_chat (id_alliance, emetteur, timestamp, message) VALUES (".$user->id_alliance.", ".$user->id_user.", ".time().", '$message');");
$bdd->deconnexion();
}
}
else
{
if (!empty($_GET['time']))
$time = intval(gpc("time"))." ORDER BY timestamp DESC";
else
$time = "0 ORDER BY timestamp DESC LIMIT 15";
if (isset($SESS) && isset($SESS->values['connected']) && $SESS->values['connected'] && !empty($SESS->values['id']) && !empty($SESS->values['race']) && !empty($SESS->level) && isset($SESS->values['idPlan']) && isset($SESS->values['idAsteroide'])) {
include_once("Class/user.php");
$user = new User($SESS->values['id']);
if (!empty($user->id_alliance)) {
if (isset($_POST['message'])) {
$message = htmlentities(trim(gpc("message", "post")));
if (!empty($message) || $message == "0") {
$bdd = new BDD();
$bdd->escape($message);
$bdd->query("INSERT INTO $table_alliances_chat (id_alliance, emetteur, timestamp, message) VALUES (".$user->id_alliance.", ".$user->id_user.", ".time().", '$message');");
$bdd->deconnexion();
}
} else {
if (!empty($_GET['time'])) {
$time = intval(gpc("time"))." ORDER BY timestamp DESC";
} else {
$time = "0 ORDER BY timestamp DESC LIMIT 15";
}
$bdd = new BDD();
$messages = $bdd->query("SELECT C.*, U.pseudo FROM $table_alliances_chat C INNER JOIN $table_user U ON U.id = C.emetteur WHERE C.id_alliance = ".$user->id_alliance." AND C.timestamp > $time;");
$bdd->deconnexion();
$bdd = new BDD();
$messages = $bdd->query("SELECT C.*, U.pseudo FROM $table_alliances_chat C INNER JOIN $table_user U ON U.id = C.emetteur WHERE C.id_alliance = ".$user->id_alliance." AND C.timestamp > $time;");
$bdd->deconnexion();
header("X-JSON: ".json_encode($messages));
}
}
header("X-JSON: ".json_encode($messages));
}
}
}
?>