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

Compare commits

base: halo-battle:4cecf2780645e7c6644e13f641218dbf15a86c90
Branches Tags
halo-battle:master
halo-battle:fix/debloque_techno_expansion
halo-battle:fix/corrige_adresse_rapport_erreur
...
compare: halo-battle:5b17a7dbd733cd3c8466a05f78c3168f9dfd60f6
Branches Tags
halo-battle:master
halo-battle:fix/debloque_techno_expansion
halo-battle:fix/corrige_adresse_rapport_erreur

3 Commits
4cecf27806 ... 5b17a7dbd7

Author SHA1 Message Date
Nigel
5b17a7dbd7 Merge pull request 'Docker compose' (#1) from nigel_quick_fix into master
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: https://gitea.nemunai.re/halo-battle/game/pulls/1
 2020-11-21 14:06:38 +00:00
Nigel Sheldon
6ff22f0279 doker compose + deux-trois trucs pour développer plus facilement
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
2020-11-19 13:55:22 +01:00
Pierre-Olivier Mercier
7df8c34fc5 Fix for PHP 7.2 compatibility 2020-11-19 13:52:56 +01:00
7 changed files with 36 additions and 15 deletions
Show Stats Expand all files Collapse all files

5
.dockerignore
View File

@ -1,5 +1,10 @@
.drone.yml .drone.yml
.drone-manifest.yml .drone-manifest.yml
.data
.gitignore
Dockerfile
docker-compose.yml
nginx.conf
onyx2/cache/*.cache.php onyx2/cache/*.cache.php
onyx2/cache/signatures/*.sign onyx2/cache/signatures/*.sign
onyx2/log/*.log onyx2/log/*.log

3
entrypoint.sh
View File

@ -1,7 +1,8 @@
#!/bin/sh #!/bin/sh
[ -n "$MYSQL_DATABASE" ] && sed -i -r "/db/s/=\s*'([^']*)'/= '${MYSQL_DATABASE}'/" onyx2/db/default.profile.php [ -n "$MYSQL_DATABASE" ] && sed -i -r "/db/s/=\s*'([^']*)'/= '${MYSQL_DATABASE}'/" onyx2/db/default.profile.php
[ -n "$MYSQL_HOST" ] && sed -i -r "/host/s/=\s*'([^']*)'/= '${MYSQL_HOST}'/" onyx2/db/default.profile.php # superseed in onyx2/db/default.profile.php
#[ -n "$MYSQL_HOST" ] && sed -i -r "/host/s/=\s*'([^']*)'/= '${MYSQL_HOST}'/" onyx2/db/default.profile.php
[ -n "$MYSQL_USER" ] && sed -i -r "/user/s/=\s*'([^']*)'/= '${MYSQL_USER}'/" onyx2/db/default.profile.php [ -n "$MYSQL_USER" ] && sed -i -r "/user/s/=\s*'([^']*)'/= '${MYSQL_USER}'/" onyx2/db/default.profile.php
[ -n "$MYSQL_PASSWORD" ] && sed -i -r "/pass/s/=\s*'([^']*)'/= '${MYSQL_PASSWORD}'/" onyx2/db/default.profile.php [ -n "$MYSQL_PASSWORD" ] && sed -i -r "/pass/s/=\s*'([^']*)'/= '${MYSQL_PASSWORD}'/" onyx2/db/default.profile.php

4
onyx2/db/default.profile.php
View File

@ -3,7 +3,11 @@
if(!defined('ONYX')) exit; if(!defined('ONYX')) exit;
$___profile['db'] = 'hb_game'; $___profile['db'] = 'hb_game';
if (getenv("MYSQL_HOST") === False) {
$___profile['host'] = 'localhost'; $___profile['host'] = 'localhost';
} else {
$___profile['host'] = getenv("MYSQL_HOST");
}
$___profile['user'] = 'hb'; $___profile['user'] = 'hb';
$___profile['pass'] = 'hb'; $___profile['pass'] = 'hb';

6
onyx2/include/common.php
View File

@ -4,6 +4,9 @@ if(!defined('ONYX')) exit;
if (empty($sess->values["connected"]) && !defined("xCSRF")) if (empty($sess->values["connected"]) && !defined("xCSRF"))
define("xCSRF", true); define("xCSRF", true);
//A passer a True pour dev tranquillou (pas d'envois de mail, pas de https,...)
define("DEV", getenv("DEV"));
require_once("function.php"); //Inclusion des fonctions principales require_once("function.php"); //Inclusion des fonctions principales
require_once("tables.php"); //Inclusion des noms des tables de base de données correspondant à l'architecture du serveur require_once("tables.php"); //Inclusion des noms des tables de base de données correspondant à l'architecture du serveur
@ -50,7 +53,8 @@ if (!empty($sess->values["connected"]))
unset($header); unset($header);
//Evite les attaques CSRF //Evite les attaques CSRF
if (!empty($_SERVER["HTTP_REFERER"]) && !(preg_match('#^https://'.$_SERVER['HTTP_HOST'].'#', $_SERVER["HTTP_REFERER"]) && defined("xCSRF"))) if (DEV) { $protocole = "http"; } else { $protocole = "https"; }
if (!empty($_SERVER["HTTP_REFERER"]) && !(preg_match('#^'.$protocole.'://'.$_SERVER['HTTP_HOST'].'#', $_SERVER["HTTP_REFERER"]) && defined("xCSRF")))
{ {
elog("Possibilité d'attaque CSRF\n".var_export($_REQUEST, TRUE), 2); elog("Possibilité d'attaque CSRF\n".var_export($_REQUEST, TRUE), 2);
unset($_POST, $_GET); unset($_POST, $_GET);

8
onyx2/include/server/inscription.php
View File

@ -147,7 +147,13 @@ if (isset($_POST['HB_pseudo']) && isset($_POST['HB_mdp']) && isset($_POST['HB_co
//$mail->Subject='Halo-Battle :: Pre-Inscription'; //$mail->Subject='Halo-Battle :: Pre-Inscription';
//$mail->Body='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"><html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Halo-Battle :: Pr&eacute;-Inscription</title></head><body><p>F&eacute;licitations '.$pseudo.' !<br />Votre compte vient d&#39;&ecirc;tre enregistr&eacute; sur notre serveur. Un mail de confirmation vous sera envoy&eacute; lors de la sortie du jeu en ligne Halo-Battle. Si vous ne recevez pas l\'email de confirmation, <a href="mailto:technique@halo-battle.s-fr.com">contactez un administrateur</a>.<br /><br />A tr&egrave;s bient&ocirc;t pour la sortie d&#39;Halo-Battle !</p></body></html>'; //$mail->Body='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"><html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Halo-Battle :: Pr&eacute;-Inscription</title></head><body><p>F&eacute;licitations '.$pseudo.' !<br />Votre compte vient d&#39;&ecirc;tre enregistr&eacute; sur notre serveur. Un mail de confirmation vous sera envoy&eacute; lors de la sortie du jeu en ligne Halo-Battle. Si vous ne recevez pas l\'email de confirmation, <a href="mailto:technique@halo-battle.s-fr.com">contactez un administrateur</a>.<br /><br />A tr&egrave;s bient&ocirc;t pour la sortie d&#39;Halo-Battle !</p></body></html>';
if(!$mail->Send()){ if (DEV) {
$ret = true;
} else {
$ret = $mail->Send();
}
if(!$ret){
$template->assign('message','Erreur lors de l\'envoie du courriel de confirmation !<br /><br /><small><i>'.$mail->ErrorInfo.'</i></small><br /><br />Si le problème perciste, <a href="mailto:technique@halo-battle.fr">contactez un administrateur</a>.'); $template->assign('message','Erreur lors de l\'envoie du courriel de confirmation !<br /><br /><small><i>'.$mail->ErrorInfo.'</i></small><br /><br />Si le problème perciste, <a href="mailto:technique@halo-battle.fr">contactez un administrateur</a>.');
$template->assign('couleur','red'); $template->assign('couleur','red');
$template->display('cms/erreur.tpl'); $template->display('cms/erreur.tpl');

3
onyx2/include/server/validation.php
View File

@ -16,7 +16,8 @@ if (!empty($_GET['i'])) {
case 1: case 1:
//$url = "http://battle.halo.fr/"; //$url = "http://battle.halo.fr/";
//$url = "http://hb.s-fr.com/beta.php"; //$url = "http://hb.s-fr.com/beta.php";
$url = "https://beta.halo-battle.fr/"; //$url = "https://beta.halo-battle.fr/";
$url = 'http://'.$_SERVER['HTTP_HOST'].'/';
break; break;
default: default:
$url = "http://battle.halo.fr/"; $url = "http://battle.halo.fr/";