diff --git a/app/controller/admin.php b/app/controller/admin.php index 27cbb21c6bbd6f444c81cb90e221bae41855380e..528efaeb8c3d6a6b5f0a318e2db9ba6e390af2de 100644 --- a/app/controller/admin.php +++ b/app/controller/admin.php @@ -1165,12 +1165,12 @@ class Admin extends Controller break; case 'update': if ($f3->get('POST.test')=='1') { - $datas = $this->banque_update($f3, $_FILES['file']['tmp_name']); - $result = $datas['update'] . " dons récurrents mis à jour sur un total de ". $datas['total']." dons récurrents."; + $datas = $this->banque_update($f3, $_FILES['file']); + $result = $datas['update'] . " dons récurrents mis à jour sur un total de ". $datas['total']." dons récurrents (fichier : \"" . htmlentities($_FILES['file']['name']) . "\")."; $message = "Il s'agit d'un <b>test</b><br />"; } else { - $datas = $this->banque_update($f3, $_FILES['file']['tmp_name'], false); - $result = $datas['update'] . " dons récurrents mis à jour sur un total de ". $datas['total']." dons récurrents."; + $datas = $this->banque_update($f3, $_FILES['file'], false); + $result = $datas['update'] . " dons récurrents mis à jour sur un total de ". $datas['total']." dons récurrents (fichier : \"" . htmlentities($_FILES['file']['name']) . "\")."; } if (count($datas['comptabilise'])>0 or count($datas['sans_cumul'])>0) { $error = count($datas['comptabilise']) . " dons récurrents déjà comptabilisés et ". count($datas['sans_cumul'])." dons récurrents sans cumul."; @@ -1376,10 +1376,11 @@ class Admin extends Controller return $datas; } - public function banque_update($f3, $filename, $testing=true) + public function banque_update($f3, $file, $testing=true) { $log = new \Log('/banque_update.log'); - $log->write('Processing recurrent donations (testing: ' . ($testing ? 'true' : 'false') . ')'); + $log->write('Processing recurrent donations on file "' . $file['name'] . '" (testing: ' . ($testing ? 'true' : 'false') . ')'); + $filename = $file['tmp_name']; $separator = ";"; $datas = array(); @@ -1591,7 +1592,7 @@ class Admin extends Controller $datas['update'] = $update; //! recurrent transactions remisées just added $datas['comptabilise'] = $comptabilise; //! recurrent transactions remisées already added $datas['sans_cumul'] = $sans_cumul; //! empty - $log->write('Processing recurrent donations finished.'); + $log->write('Processing recurrent donations finished on file "' . $file['name'] . '"'); return $datas; }