From 729fdae92c010a0886bce5e5880ea17fe3d41056 Mon Sep 17 00:00:00 2001 From: Nigel Sheldon Date: Sat, 21 Nov 2020 15:10:42 +0100 Subject: [PATCH 1/5] Ajout d'un readme et d'un docker-compose --- .gitignore | 1 + README.md | 14 ++++++++++++ docker-compose.yml | 53 ++++++++++++++++++++++++++++++++++++++++++++++ nginx.conf | 18 ++++++++++++++++ 4 files changed, 86 insertions(+) create mode 100644 .gitignore create mode 100644 README.md create mode 100644 docker-compose.yml create mode 100644 nginx.conf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ea26ec2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.data diff --git a/README.md b/README.md new file mode 100644 index 0000000..9b5071a --- /dev/null +++ b/README.md @@ -0,0 +1,14 @@ +# Halo-Battle + +## Développer +HB peut petre lancé localement via un docker. Pour cela, vous devez avoir installé Docker et docker-compose. +une fois installé, lancez un `docker-compouse up` à la racine du repo. Une fois que tout à boot, vous devez +injecter le code SQL avec `docker exec -i game_mariadb_1 mysql --user=hb --password=hb hb_game < schema.sql` + +HB est alors disponible sur http://localhost:8080. + +À la création du compte, aucun email n'est envoyé. Pour récupérer votre code de confirmation, vous devez +vous connecter au serveur MySQL via `docker exec -it game_mariadb_1 mysql --user=hb --password=hb hb_game` +et récupérer votre jeton d'activation via `select id_activ from user_inscriptions WHERE pseudo LIKE 'VOTRE_PSEUDO_A_REMPLACER';` +une fois l'ID récupérer, rendez-vous à l'adresse http://localhost:8080/?p=validation&i=VOTRE_ID (pensez +bien à modifier l'id dans l'URL). diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..c70d317 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,53 @@ +version: '3.2' + +networks: + halonet: + driver: bridge + +services: + mariadb: + restart: always + image: mariadb:10.5.8-focal + networks: + - halonet + volumes: + - .data:/var/lib/mysql + environment: + - MYSQL_USER=hb + - MYSQL_PASSWORD=hb + - MYSQL_ROOT_PASSWORD=hb + - MYSQL_DATABASE=hb_game + + hb: + image: hb + container_name: hb + depends_on: + - mariadb + networks: + - halonet + volumes: + - ./htdocs:/usr/src/hb-main/htdocs:rw + - ./onyx2:/usr/src/hb-main/onyx2:rw + # make cache and compile writable + don't add file to local host + - /usr/src/hb-main/onyx2/cache + - /usr/src/hb-main/onyx2/log + - /usr/src/hb-main/onyx2/modules/templates/compile + environment: + - MYSQL_DATABASE=hb_game + - MYSQL_HOST=mariadb + - MYSQL_USER=hb + - MYSQL_PASSWORD=hb + - DISABLE_TLS=true + - DEV=true + + nginx: + image: nginx:1.19.4-alpine + depends_on: + - hb + networks: + - halonet + volumes: + - ./nginx.conf:/etc/nginx/conf.d/default.conf + - ./htdocs:/usr/src/hb-main/htdocs:ro + ports: + - "8080:80" diff --git a/nginx.conf b/nginx.conf new file mode 100644 index 0000000..f50c647 --- /dev/null +++ b/nginx.conf @@ -0,0 +1,18 @@ +server { + listen 80; + server_name localhost; + root /usr/src/hb-main/htdocs; + + location / { + try_files $uri $uri?$query_string /index.php?$query_string; + } + + location ~* \.php$ { + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param SCRIPT_NAME $fastcgi_script_name; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_index index.php; + fastcgi_pass hb:9000; + } +} From 38851de02be9a1ca3baa4e5e7aef5bf15a168f96 Mon Sep 17 00:00:00 2001 From: Nigel Sheldon Date: Sat, 21 Nov 2020 19:53:43 +0100 Subject: [PATCH 2/5] Corrections suite aux retours de Nemu --- docker-compose.yml | 4 ++-- nginx.conf | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c70d317..1f8e5f5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ networks: services: mariadb: restart: always - image: mariadb:10.5.8-focal + image: mariadb:10-focal networks: - halonet volumes: @@ -41,7 +41,7 @@ services: - DEV=true nginx: - image: nginx:1.19.4-alpine + image: nginx:1-alpine depends_on: - hb networks: diff --git a/nginx.conf b/nginx.conf index f50c647..5df62c8 100644 --- a/nginx.conf +++ b/nginx.conf @@ -4,13 +4,16 @@ server { root /usr/src/hb-main/htdocs; location / { - try_files $uri $uri?$query_string /index.php?$query_string; + index index.php; + try_files $uri $uri/ /index.php; } location ~* \.php$ { include fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_NAME $fastcgi_script_name; + fastcgi_param HTTP_HOST $server_name; + fastcgi_param REMOTE_ADDR $remote_addr; fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_index index.php; fastcgi_pass hb:9000; From fa20708cbaec3d6b66816f92fb1498cff7dbb493 Mon Sep 17 00:00:00 2001 From: Nigel Sheldon Date: Sun, 22 Nov 2020 11:26:07 +0100 Subject: [PATCH 3/5] =?UTF-8?q?Corrige=20les=20retours=20=C3=A0=20la=20lig?= =?UTF-8?q?ne=20dans=20les=20messages?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- onyx2/modules/templates/smarty/plugins/modifier.nl2br.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onyx2/modules/templates/smarty/plugins/modifier.nl2br.php b/onyx2/modules/templates/smarty/plugins/modifier.nl2br.php index d9ae192..d5c2bd9 100644 --- a/onyx2/modules/templates/smarty/plugins/modifier.nl2br.php +++ b/onyx2/modules/templates/smarty/plugins/modifier.nl2br.php @@ -27,7 +27,7 @@ */ function smarty_modifier_nl2br($string) { - return nl2br($string); + return str_replace(array('\r\n', '\r', '\n'), "
", $string); } /* vim: set expandtab: */ From a2f62c1c1cef5304950280648f65b191d7812c09 Mon Sep 17 00:00:00 2001 From: Nigel Sheldon Date: Sun, 22 Nov 2020 10:43:43 +0100 Subject: [PATCH 4/5] =?UTF-8?q?Corrige=20la=20string=20de=20caract=C3=A8re?= =?UTF-8?q?=20qui=20permet=20de=20mettre=20une=20majuscule=20au=20premier?= =?UTF-8?q?=20mots=20et=20supprime=20un=20fichier=20inutile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../smarty/plugins/modifier.ucfirst.php | 2 +- .../smarty/plugins/modifier.ucfirst.php3 | 31 ------------------- 2 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 onyx2/modules/templates/smarty/plugins/modifier.ucfirst.php3 diff --git a/onyx2/modules/templates/smarty/plugins/modifier.ucfirst.php b/onyx2/modules/templates/smarty/plugins/modifier.ucfirst.php index bb8ff9e..ea14477 100644 --- a/onyx2/modules/templates/smarty/plugins/modifier.ucfirst.php +++ b/onyx2/modules/templates/smarty/plugins/modifier.ucfirst.php @@ -20,7 +20,7 @@ */ function smarty_modifier_ucfirst($chaine) { - $chaineS = strtr($chaine, "áàâäãéèêëẽíìîïĩóòôöõúùûüũýỳŷÿỹ", "ÁÀÂÄÃÉÈÊËẼÍÌÎÏĨÓÒÔÖÕÚÙÛÜŨÝỲŶŸỸ"); + $chaineS = strtr($chaine, "áàâäãéèêëẽíìîïĩóòôöõúùûüũýỳŷÿỹ", "ÁÀÂÄÃÉÈÊËẼÍÌÎÏĨÓÒÔÖÕÚÙÛÜŨÝỲŶŸỸ"); if ($chaineS[0].$chaineS[1] != $chaine[0].$chaine[1]) { return $chaineS[0].$chaineS[1].substr($chaine, 2); } else { diff --git a/onyx2/modules/templates/smarty/plugins/modifier.ucfirst.php3 b/onyx2/modules/templates/smarty/plugins/modifier.ucfirst.php3 deleted file mode 100644 index ea01fe6..0000000 --- a/onyx2/modules/templates/smarty/plugins/modifier.ucfirst.php3 +++ /dev/null @@ -1,31 +0,0 @@ - - * Name: capitalize
- * Purpose: capitalize words in the string - * @link http://smarty.php.net/manual/en/language.modifiers.php#LANGUAGE.MODIFIER.CAPITALIZE - * capitalize (Smarty online manual) - * @author Monte Ohrt - * @param string - * @return string - */ -function smarty_modifier_ucfirst($chaine) -{ - $chaineS = strtr($chaine, "áàâäãéèêëẽíìîïĩóòôöõúùûüũýỳŷÿỹ", "ÁÀÂÄÃÉÈÊËẼÍÌÎÏĨÓÒÔÖÕÚÙÛÜŨÝỲŶŸỸ"); - if ($chaineS[0].$chaineS[1] != $chaine[0].$chaine[1]) - return $chaineS[0].$chaineS[1].substr($chaine, 2); - else - return ucfirst($chaine); -} - - -?> From 664a7220f96c596116c8b6d1791091683001ff09 Mon Sep 17 00:00:00 2001 From: Nigel Sheldon Date: Sun, 22 Nov 2020 11:02:59 +0100 Subject: [PATCH 5/5] =?UTF-8?q?Utilisation=20de=20fonction=20c=C5=93ur=20d?= =?UTF-8?q?e=20PHP=20pour=20la=20gestion=20des=20accents=20majuscules?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/templates/smarty/plugins/modifier.ucfirst.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/onyx2/modules/templates/smarty/plugins/modifier.ucfirst.php b/onyx2/modules/templates/smarty/plugins/modifier.ucfirst.php index ea14477..c625363 100644 --- a/onyx2/modules/templates/smarty/plugins/modifier.ucfirst.php +++ b/onyx2/modules/templates/smarty/plugins/modifier.ucfirst.php @@ -20,10 +20,5 @@ */ function smarty_modifier_ucfirst($chaine) { - $chaineS = strtr($chaine, "áàâäãéèêëẽíìîïĩóòôöõúùûüũýỳŷÿỹ", "ÁÀÂÄÃÉÈÊËẼÍÌÎÏĨÓÒÔÖÕÚÙÛÜŨÝỲŶŸỸ"); - if ($chaineS[0].$chaineS[1] != $chaine[0].$chaine[1]) { - return $chaineS[0].$chaineS[1].substr($chaine, 2); - } else { - return ucfirst($chaine); - } + return mb_convert_case($chaine, MB_CASE_TITLE, 'UTF-8'); }