From e3e9683be0f7a53cfd4c661d56f3d50c225a70a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?=
 <jean-philippe.guerard@tigreraye.org>
Date: Wed, 11 Jan 2012 00:02:02 +0100
Subject: [PATCH] The removal function needs access to the database

---
 admin/index.php               | 2 +-
 adminstuds.php                | 4 +---
 fonctions.php                 | 2 +-
 scripts/nettoyage_sondage.php | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/admin/index.php b/admin/index.php
index 34679ac..aa8dc5b 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -87,7 +87,7 @@ while($dsondage = $sondage->FetchNextObject(false)) {
     // On inclut la routine de suppression
     $date=date('H:i:s d/m/Y');
 
-    if ( remove_sondage( $dsondage->id_sondage ) ) {
+    if ( remove_sondage( $connect, $dsondage->id_sondage ) ) {
 
       // ecriture des traces dans le fichier de logs
       error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", 3, 'logs_studs.txt');
diff --git a/adminstuds.php b/adminstuds.php
index 9887f22..2a85c39 100644
--- a/adminstuds.php
+++ b/adminstuds.php
@@ -313,9 +313,7 @@ if (isset($_POST["confirmesuppression"]) || isset($_POST["confirmesuppression_x"
   $nbuser=$user_studs->RecordCount();
   $date=date('H:i:s d/m/Y:');
 
-  remove_sondage( $numsondage ) ;
-
-  if ( remove_sondage( $numsondage ) ) {
+  if ( remove_sondage( $connect, $numsondage ) ) {
     // on ecrit dans le fichier de logs la suppression du sondage
     error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", 3, 'admin/logs_studs.txt');
   
diff --git a/fonctions.php b/fonctions.php
index 16f09b5..2e77b86 100644
--- a/fonctions.php
+++ b/fonctions.php
@@ -203,7 +203,7 @@ function getUrlSondage($id, $admin = false)
   return $url;
 }
 
-function remove_sondage( $numsondage ){
+function remove_sondage( $connect, $numsondage ){
 
   $connect->StartTrans();
 
diff --git a/scripts/nettoyage_sondage.php b/scripts/nettoyage_sondage.php
index 9ed2ca4..9b5d163 100644
--- a/scripts/nettoyage_sondage.php
+++ b/scripts/nettoyage_sondage.php
@@ -50,7 +50,7 @@ while ($dsondage=$sondage->FetchNextObject(false)) {
   if ($date_courante > strtotime($dsondage->date_fin)) {
     //destruction des données dans la base
 
-    if ( remove_sondage( $dsondage->id_sondage ) ) {
+    if ( remove_sondage( $connect, $dsondage->id_sondage ) ) {
 
       // ecriture des traces dans le fichier de logs
       error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", 3, '../admin/logs_studs.txt');