From 280924b99cfbfe72eaf0302acd97417ca033cde9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Oudin?= <oudin@crans.org>
Date: Fri, 6 Dec 2019 18:39:25 +0100
Subject: [PATCH] =?UTF-8?q?Envoi=20de=20mail=20et=20mise=20=C3=A0=20jour?=
=?UTF-8?q?=20des=20cumuls?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controller/bank.php | 9 ++-------
app/controller/campaign.php | 5 ++++-
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/app/controller/bank.php b/app/controller/bank.php
index badff2a..6025e46 100644
--- a/app/controller/bank.php
+++ b/app/controller/bank.php
@@ -161,7 +161,7 @@ class Bank extends Controller
$f3->get('container')['command_handler']->handle(new UserUpdateTotalCommand($user['id'], (int) $user['total'] + $don['somme']));
$f3->get('container')['command_handler']->handle(new UserUpdateCumulCommand($user['id'], (int) $user['cumul'] + $don['somme']));
}
- $result = $db->query("SELECT cumul FROM users WHERE id='".$don['user_id']."'");
+ $result = $db->query("SELECT cumul FROM users WHERE id='".$user['id']."'");
$cumul = $result->fetch(\PDO::FETCH_ASSOC);
$cumul = $cumul['cumul'];
$cb_log->write("Nouveau cumul: ".$cumul);
@@ -202,12 +202,7 @@ Toute l'équipe de La Quadrature du Net
")."\n\n";
// Création de l'url d'administration
- $admin_url = "https://don.laquadrature.net/perso";
- foreach ($f3->get('languages') as $key => $language) {
- if ($lang==$language[1]) {
- $admin_url = "https://".$language[0].$f3->get('dev').".laquadrature.net/perso";
- }
- }
+ $admin_url = "https://".$f3->get('dev').".laquadrature.net/perso";
// Remplacement des variables par leurs valeurs
$fields = array(
diff --git a/app/controller/campaign.php b/app/controller/campaign.php
index 8e924e3..45e19ce 100644
--- a/app/controller/campaign.php
+++ b/app/controller/campaign.php
@@ -130,7 +130,10 @@ class Campaign extends Controller
$f3->error("403");
}
- $user_id = $db->lastInsertId();
+ $user = $f3->get('container')['user_finder']->findByEmail(\Utils::asl($email));
+ $user_id = $user['id'];
+ $user_log = new \Log('user.log');
+ $user_log->write("ID ". $user_id. "\n");
}
}
$sql = "INSERT INTO dons SET
--
GitLab