From bda833f6e3c1be106e27698d70eb8aaa1899d83c Mon Sep 17 00:00:00 2001 From: adrien Date: Fri, 13 Nov 2020 05:08:21 +0100 Subject: [PATCH] 404! --- 404.php | 32 ++++++++++++++++++++++++++++++++ gen-grid.php => index.php | 0 nginx-example.conf | 21 +++++++++++++-------- sudoku.php | 39 +-------------------------------------- 4 files changed, 46 insertions(+), 46 deletions(-) create mode 100644 404.php rename gen-grid.php => index.php (100%) diff --git a/404.php b/404.php new file mode 100644 index 0000000..f70e3e2 --- /dev/null +++ b/404.php @@ -0,0 +1,32 @@ +generate(); + + header("HTTP/1.0 404 Not Found", true, 404); + + $urlDir = $_SERVER["REQUEST_SCHEME"] . "://" . $_SERVER["HTTP_HOST"] . dirname($_SERVER["DOCUMENT_URI"]); + $urlExample = $urlDir . "/" . $grid->toString(); +?> + + + + + + Sudoku non trouvé + + + + +
+

#404

+
+ L'adresse URL doit être de la forme : /grille,
+ grille étant une suite de 81 caractères représentant la grille de gauche à droite puis de haut en bas, soit : + + Exemple :
+ + diff --git a/gen-grid.php b/index.php similarity index 100% rename from gen-grid.php rename to index.php diff --git a/nginx-example.conf b/nginx-example.conf index 6a97888..7b82650 100644 --- a/nginx-example.conf +++ b/nginx-example.conf @@ -5,12 +5,12 @@ location /sudoku/ { rewrite ^ https://$server_name$request_uri? permanent; } - index gen-grid.php; + index index.php; try_files $uri $uri/ @add-php-extention; - + location ~ [^/]\.php(/|$) { - try_files $uri @sudoku-grid; + try_files $uri =404; fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php/php7.3-fpm-sudoku.sock; fastcgi_index gen-grid.php; @@ -19,12 +19,17 @@ location /sudoku/ { fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param SCRIPT_FILENAME $request_filename; } + + error_page 404 /sudoku/404.php; + location /sudoku/404.php { + internal; + } +} + +location ~ "^/sudoku/([1-9.]{81})$" { + rewrite "^/sudoku/([1-9.]{81})$" /sudoku/sudoku.php?grid=$1 last; } location @add-php-extention { rewrite ^([^?#]*)(\?.*)?(#.*)?$ $1.php$2$3 last; -} - -location @sudoku-grid { - rewrite ^/sudoku/(.*).php$ /sudoku/sudoku.php?grid=$1 last; -} +} \ No newline at end of file diff --git a/sudoku.php b/sudoku.php index 5b20929..466828a 100644 --- a/sudoku.php +++ b/sudoku.php @@ -1,9 +1,7 @@ @@ -111,38 +109,3 @@ -generate(); - - header("HTTP/1.0 400 Bad Request", true, 400); - - $urlDir = $_SERVER["REQUEST_SCHEME"] . "://" . $_SERVER["HTTP_HOST"] . dirname($_SERVER["DOCUMENT_URI"]); - $urlExample = $urlDir . "/" . $grid->toString(); -?> - - - - - - Adresse incorrecte - - - - -
-

Adresse incorrecte

-
- L'adresse URL doit être de la forme : /grille,
- grille étant une suite de 81 caractères représentant la grille de gauche à droite puis de haut en bas, soit : - - Exemple :
- - -