diff --git a/.gitignore b/.gitignore index e77ceac..7a4fc65 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -config/conf.php +config/config.php .idea /public/uploads /tmp diff --git a/config/config.php b/config/apply.php similarity index 96% rename from config/config.php rename to config/apply.php index 77e89ad..80827d1 100644 --- a/config/config.php +++ b/config/apply.php @@ -1,5 +1,5 @@ 'admin@gmarche-testmail.com', - 'mail.from' => 'no-reply@admin.fr', + 'mail.from' => '$mail_from', Swift_Mailer::class => \DI\factory(\Framework\SwiftMailerFactory::class) ]; diff --git a/config/conf-sample.php b/config/config-sample.php similarity index 87% rename from config/conf-sample.php rename to config/config-sample.php index be493eb..be398a3 100644 --- a/config/conf-sample.php +++ b/config/config-sample.php @@ -3,4 +3,5 @@ $db_username = ''; $db_password = ''; $db_name = ''; + $mail_from = ''; $g1_node = 'https://duniter-g1.p2p.legal'; diff --git a/public/ajax/addRecord.php b/public/ajax/addRecord.php index 35a7060..6c81824 100644 --- a/public/ajax/addRecord.php +++ b/public/ajax/addRecord.php @@ -3,7 +3,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'; + include '../../config/config.php'; $bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password); // Récupération des informations du formulaire diff --git a/public/ajax/addRecord2.php b/public/ajax/addRecord2.php index 0513b8d..1101410 100644 --- a/public/ajax/addRecord2.php +++ b/public/ajax/addRecord2.php @@ -3,7 +3,7 @@ if(isset($_POST['produit']) && isset($_POST['acheteur']) && isset($_POST['quantite']) ) { // Connexion à la base de données - include '../../config/conf.php'; + include '../../config/config.php'; $bdd = new \PDO("mysql:host=$db_server;dbname=$db_name", $db_username, $db_password); // Récupération des informations du formulaire diff --git a/public/ajax/connexion.php b/public/ajax/connexion.php index 3595c80..951db35 100644 --- a/public/ajax/connexion.php +++ b/public/ajax/connexion.php @@ -1,6 +1,6 @@ addModule(AdminModule::class) ->addModule(ContactModule::class) ->addModule(ProductModule::class)