halo-battle/game
1
0
Fork 1
Code Issues Pull Requests Projects Releases Activity

task/20210226/various_fix #21

Merged
nemunaire merged 5 commits from task/20210226/various_fix into master 2021-02-27 08:57:26 +00:00
Conversation 0 Commits 5 Files Changed 6 +5 -3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 067b45bdfd - Show all commits

8
onyx2/include/game/flottes/details.php
View File

@ -28,16 +28,18 @@ if (!defined('INDEX')) {
if ($flotteN->mission == '6') { if ($flotteN->mission == '6') {
erreur('Votre flotte est déjà en train de revenir !', 'red', '?p=flotte&n='.$idN, 1500); erreur('Votre flotte est déjà en train de revenir !', 'red', '?p=flotte&n='.$idN, 1500);
} elseif ($flotteN->end_time > $tpsDD) { } elseif ($flotteN->end_time > $tpsDD) {
$bdd->query("UPDATE $table_flottes SET mission = '6', effectue = '1', end_time = $tpsDD, end_galaxie = start_galaxie, end_ss = start_ss, end_position = start_position WHERE id_user = ".$planete->id_user." AND id = $idN;"); $bdd = new BDD();
$bdd->query("UPDATE $table_flottes SET mission = '6', end_time = $tpsDD, end_planete = start_planete WHERE id_user = ".$planete->id_user." AND id = $idN;");
$bdd->deconnexion();
redirection("?p=flotte&n=".$idN); redirection("?p=flotte&n=".$idN);
} else { } else {
erreur('Impossible d\'annuler la mission, elle a déjà commencée.', "red", '?p=flotte&n='.$idN, 1500); erreur('Impossible d\'annuler la mission, elle a déjà commencée.', "red", '?p=flotte&n='.$idN, 1500);
} }
} }
$SESS->values['ret_fleet'] = md5('HB.fleet_'.rand().'☺ß☻'); $SESS->values['ret_fleet'] = md5('HB.fleet_'.rand().'☺ß☻');
$SESS->put(); $SESS->put();
$template->assign('ret_fleet', $SESS->values['ret_fleet']); $template->assign('ret_fleet', $SESS->values['ret_fleet']);
$template->assign('flotte', $flotteN); $template->assign('flotte', $flotteN);
$page = 'flotten'; $page = 'flotten';