From a874b4f1a51b2ac038c31bf7daeb89a38a5fcb64 Mon Sep 17 00:00:00 2001
From: Laurent Giovannoni <laurent.giovannoni@maarch.org>
Date: Wed, 14 Jun 2017 12:04:53 +0200
Subject: [PATCH] FIX #5628
---
.../indexing_searching/contact_check.php | 10 ++++++----
modules/avis/class/avis_controler_Abstract.php | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/apps/maarch_entreprise/indexing_searching/contact_check.php b/apps/maarch_entreprise/indexing_searching/contact_check.php
index 834a41b3b83..b4590d5308f 100644
--- a/apps/maarch_entreprise/indexing_searching/contact_check.php
+++ b/apps/maarch_entreprise/indexing_searching/contact_check.php
@@ -42,15 +42,17 @@ if(empty($_POST['contact_id']) || $_POST['category'] == 'outgoing'){
//IF EXTERNAL CONTACT
if (is_numeric($_POST['contact_id'])) {
- $where = "status <> 'DEL' AND contact_id = ".$_POST['contact_id']." AND address_id = ".$_POST['address_id']." AND creation_date >= (select CURRENT_DATE + integer '-".$_SESSION['check_days_before']."')";
- $wherePDO = "status <> 'DEL' AND contact_id = ? AND address_id = ? AND creation_date >= (select CURRENT_DATE + integer '-".$_SESSION['check_days_before']."')";
+ $where = "status <> 'DEL' AND contact_id = ".$_POST['contact_id']." AND address_id = ".$_POST['address_id']
+ ." AND (creation_date >= " . $db->current_datetime() . " - INTERVAL '".$_SESSION['check_days_before']."' DAY)";
+ $wherePDO = "status <> 'DEL' AND contact_id = ? AND address_id = ? AND (creation_date >= " . $db->current_datetime() . " - INTERVAL '".$_SESSION['check_days_before']."' DAY)";
$arrayPDO = array($_POST['contact_id'], $_POST['address_id']);
//IF INTERNAL CONTACT
} else {
- $where = "status <> 'DEL' AND (exp_user_id = '".$_POST['contact_id']."' OR dest_user_id = '".$_POST['contact_id']."') AND creation_date >= (select CURRENT_DATE + integer '-".$_SESSION['check_days_before']."')";
- $wherePDO = "status <> 'DEL' AND (exp_user_id = ? OR dest_user_id = ?) AND creation_date >= (select CURRENT_DATE + integer '-".$_SESSION['check_days_before']."')";
+ $where = "status <> 'DEL' AND (exp_user_id = '".$_POST['contact_id']."' OR dest_user_id = '".$_POST['contact_id']."') AND (creation_date >= " . $db->current_datetime() . " - INTERVAL '".$_SESSION['check_days_before']."' DAY)";
+ $wherePDO = "status <> 'DEL' AND (exp_user_id = ? OR dest_user_id = ?) AND (creation_date >= " . $db->current_datetime() . " - INTERVAL '".$_SESSION['check_days_before']."' DAY)";
$arrayPDO = array($_POST['contact_id'], $_POST['contact_id']);
}
+ echo $wherePDO;
//MERGE GLOBAL SECURITY WITH QUERY DOC
$wherePDO = $wherePDO . ' AND ('.$whereSec.')';
diff --git a/modules/avis/class/avis_controler_Abstract.php b/modules/avis/class/avis_controler_Abstract.php
index b6d79fb6c38..fac92801520 100755
--- a/modules/avis/class/avis_controler_Abstract.php
+++ b/modules/avis/class/avis_controler_Abstract.php
@@ -44,7 +44,7 @@ abstract class avis_controler_Abstract
$stmt = $db->query($query, array($recommendation_limit_date, $resId));
}
- $query = "UPDATE res_letterbox SET modification_date = CURRENT_DATE where res_id = ?";
+ $query = "UPDATE res_letterbox SET modification_date = " . $db->current_datetime() . " where res_id = ?";
$stmt = $db->query($query, array($resId));
}
--
GitLab