From 24d3336d007c3e6daf5b8c2dd04c29507174f88b Mon Sep 17 00:00:00 2001 From: poka Date: Wed, 20 Nov 2019 21:59:17 +0100 Subject: [PATCH] Change config var names, fusion config, remove prefix in url routing --- .gitignore | 1 - config.php | 4 ---- config/conf-sample.php | 9 +++++---- config/{config-sample.php => config.php} | 9 +++++---- public/ajax/addRecord.php | 2 +- public/ajax/addRecord2.php | 2 +- public/ajax/connexion.php | 2 +- public/ajax/deleteProduits.php | 2 +- public/ajax/deleteRecherches.php | 2 +- public/ajax/readProduitsDetails.php | 2 +- public/ajax/readRecherchesDetails.php | 2 +- public/ajax/readRecords.php | 2 +- public/ajax/readRecords2.php | 2 +- public/ajax/updateProduitsDetails.php | 2 +- public/ajax/updateRecherchesDetails.php | 2 +- src/Framework/Middleware/TrailingSlashMiddleware.php | 4 ++-- src/Gmarche/config.php | 2 +- 17 files changed, 24 insertions(+), 27 deletions(-) delete mode 100644 config.php rename config/{config-sample.php => config.php} (91%) diff --git a/.gitignore b/.gitignore index 422241c..e77ceac 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -config/config.php config/conf.php .idea /public/uploads diff --git a/config.php b/config.php deleted file mode 100644 index 212f5fc..0000000 --- a/config.php +++ /dev/null @@ -1,4 +0,0 @@ - '/news' -]; \ No newline at end of file diff --git a/config/conf-sample.php b/config/conf-sample.php index d322285..be493eb 100644 --- a/config/conf-sample.php +++ b/config/conf-sample.php @@ -1,5 +1,6 @@ \DI\env('ENV', 'production'), - 'database.host' => '', - 'database.username' => '', - 'database.password' => '', - 'database.name' => '', + 'database.host' => "$db_server", + 'database.username' => "$db_username", + 'database.password' => "$db_password", + 'database.name' => "$db_name", 'views.path' => dirname(__DIR__) . '/views', 'twig.extensions' => [ \DI\get(RouterTwigExtension::class), diff --git a/public/ajax/addRecord.php b/public/ajax/addRecord.php index 34883c8..35a7060 100644 --- a/public/ajax/addRecord.php +++ b/public/ajax/addRecord.php @@ -4,7 +4,7 @@ ini_set('display_errors', 0); if ($_POST['produit']!== '' && $_POST['vendeur']!== null && $_POST['quantite']>0 && $_POST['prix']>=0) { // Connexion à la base de données include '../../config/conf.php'; - $bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password); + $bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password); // Récupération des informations du formulaire $params = array(); diff --git a/public/ajax/addRecord2.php b/public/ajax/addRecord2.php index a4a107d..0513b8d 100644 --- a/public/ajax/addRecord2.php +++ b/public/ajax/addRecord2.php @@ -4,7 +4,7 @@ { // Connexion à la base de données include '../../config/conf.php'; - $bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password); + $bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password); // Récupération des informations du formulaire $params = array(); diff --git a/public/ajax/connexion.php b/public/ajax/connexion.php index 075bfc7..3595c80 100644 --- a/public/ajax/connexion.php +++ b/public/ajax/connexion.php @@ -4,7 +4,7 @@ include '../../config/conf.php'; try { - $bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password); + $bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password); if (isset($_POST['nom_connecte']) && isset($_POST['mdp']) != "") { $params["username"] = $_POST['nom_connecte']; diff --git a/public/ajax/deleteProduits.php b/public/ajax/deleteProduits.php index 444e62e..80faed5 100644 --- a/public/ajax/deleteProduits.php +++ b/public/ajax/deleteProduits.php @@ -4,7 +4,7 @@ include '../../config/conf.php'; if($_POST['id'] !== null) { // Connexion à la base de données - $bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password); + $bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password); $params['product_id'] = $_POST['id']; $filename = $_POST['nom_image']; diff --git a/public/ajax/deleteRecherches.php b/public/ajax/deleteRecherches.php index 521e9ff..35dd406 100644 --- a/public/ajax/deleteRecherches.php +++ b/public/ajax/deleteRecherches.php @@ -4,7 +4,7 @@ include '../../config/conf.php'; if($_POST['id_r'] !== null) { // Connexion à la base de données - $bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password); + $bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password); $params['souhait_id'] = $_POST['id_r']; $filename = $_POST['nom_image']; diff --git a/public/ajax/readProduitsDetails.php b/public/ajax/readProduitsDetails.php index 76d3b59..c616086 100644 --- a/public/ajax/readProduitsDetails.php +++ b/public/ajax/readProduitsDetails.php @@ -4,7 +4,7 @@ try { - $bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password); + $bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password); if (isset($_POST['id']) && isset($_POST['id']) != "") { $product_id = $_POST['id']; diff --git a/public/ajax/readRecherchesDetails.php b/public/ajax/readRecherchesDetails.php index e5358cf..1f3d931 100644 --- a/public/ajax/readRecherchesDetails.php +++ b/public/ajax/readRecherchesDetails.php @@ -4,7 +4,7 @@ include '../../config/conf.php'; try { - $bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password); + $bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password); if (isset($_POST['id_r']) && isset($_POST['id_r']) != "") { $souhait_id = $_POST['id_r']; diff --git a/public/ajax/readRecords.php b/public/ajax/readRecords.php index 8077419..36b524f 100644 --- a/public/ajax/readRecords.php +++ b/public/ajax/readRecords.php @@ -3,7 +3,7 @@ include '../../config/conf.php'; $antenne_slug = $_GET['antenne_slug']; $nom_connecte = $_GET['nom_connecte']; - $bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password); + $bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password); // Affichage des intitulés de colonnes $data = ' diff --git a/public/ajax/readRecords2.php b/public/ajax/readRecords2.php index e810520..3ea2bda 100644 --- a/public/ajax/readRecords2.php +++ b/public/ajax/readRecords2.php @@ -3,7 +3,7 @@ include '../../config/conf.php'; $antenne_slug = $_GET['antenne_slug']; $nom_connecte = $_GET['nom_connecte']; - $bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password); + $bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password); // Affichage des intitulés de colonnes $data = '
diff --git a/public/ajax/updateProduitsDetails.php b/public/ajax/updateProduitsDetails.php index cfdd1f4..bf9d4cb 100644 --- a/public/ajax/updateProduitsDetails.php +++ b/public/ajax/updateProduitsDetails.php @@ -2,7 +2,7 @@ include '../../config/conf.php'; -$bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password); +$bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password); if(isset($_POST)) { diff --git a/public/ajax/updateRecherchesDetails.php b/public/ajax/updateRecherchesDetails.php index bfabd95..c4d4a35 100644 --- a/public/ajax/updateRecherchesDetails.php +++ b/public/ajax/updateRecherchesDetails.php @@ -2,7 +2,7 @@ include '../../config/conf.php'; -$bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password); +$bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password); if(isset($_POST)) { diff --git a/src/Framework/Middleware/TrailingSlashMiddleware.php b/src/Framework/Middleware/TrailingSlashMiddleware.php index 262a188..4c0917d 100644 --- a/src/Framework/Middleware/TrailingSlashMiddleware.php +++ b/src/Framework/Middleware/TrailingSlashMiddleware.php @@ -8,7 +8,7 @@ class TrailingSlashMiddleware { public function __invoke(ServerRequestInterface $request, callable $next) { $uri = $request->getUri()->getPath(); - if (!empty($uri) && $uri[-1] === "/") { + if (!empty($uri) && $uri[-1] === "/" && $uri !== "/") { return (new \GuzzleHttp\Psr7\Response()) ->withStatus(301) ->withHeader('Location', substr($uri, 0, -1)); @@ -16,4 +16,4 @@ class TrailingSlashMiddleware { return $next($request); } -} \ No newline at end of file +} diff --git a/src/Gmarche/config.php b/src/Gmarche/config.php index 20f652a..561c078 100644 --- a/src/Gmarche/config.php +++ b/src/Gmarche/config.php @@ -5,5 +5,5 @@ use function \Di\object; use function \Di\get; /* Chemin */ return [ - 'gmarche.prefix' => '/france' + 'gmarche.prefix' => '/' ];