lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize code

Browse Source
This commit is contained in:
Laurent Destailleur 2020-09-01 15:33:02 +02:00 committed by GitHub
parent 763515a4ca
commit a626b252bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/comm/action/class/actioncomm.class.php
View File

@ -1986,12 +1986,17 @@ class ActionComm extends CommonObject
$this->db->begin(); $this->db->begin();
//Select all action comm reminder //Select all action comm reminder
$sql = "SELECT rowid as id FROM ".MAIN_DB_PREFIX."actioncomm_reminder WHERE typeremind = 'email' AND status = 0"; $sql = "SELECT rowid as id FROM ".MAIN_DB_PREFIX."actioncomm_reminder";
$sql .= " WHERE typeremind = 'email' AND status = 0";
$sql .= " AND dateremind <= '".$this->db->idate(dol_now())."'";
$sql .= $this->db->order("dateremind", "ASC");
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
while ($obj = $this->db->fetch_object($resql)){ $formmail = new FormMail($this->db);
$actionCommReminder = new ActionCommReminder($this->db); $actionCommReminder = new ActionCommReminder($this->db);
while ($obj = $this->db->fetch_object($resql)){
$res = $actionCommReminder->fetch($obj->id); $res = $actionCommReminder->fetch($obj->id);
if ($res < 0) { if ($res < 0) {
$error++; $error++;
@ -1999,15 +2004,12 @@ class ActionComm extends CommonObject
} }
if (!$error) if (!$error)
{
if ($actionCommReminder->dateremind <= dol_now())
{ {
//Select email template //Select email template
$formmail = new FormMail($this->db);
$arraymessage = $formmail->getEMailTemplate($this->db, 'actioncomm_send', $user, $langs, (!empty($actionCommReminder->fk_email_template)) ? $actionCommReminder->fk_email_template : -1, 1); $arraymessage = $formmail->getEMailTemplate($this->db, 'actioncomm_send', $user, $langs, (!empty($actionCommReminder->fk_email_template)) ? $actionCommReminder->fk_email_template : -1, 1);
// Load event
$res = $this->fetch($actionCommReminder->fk_actioncomm); $res = $this->fetch($actionCommReminder->fk_actioncomm);
if ($res > 0) if ($res > 0)
{ {
// PREPARE EMAIL // PREPARE EMAIL
@ -2067,7 +2069,6 @@ class ActionComm extends CommonObject
} }
} }
} }
}
} else { } else {
$error++; $error++;
} }
@ -2075,7 +2076,8 @@ class ActionComm extends CommonObject
if (!$error) if (!$error)
{ {
// Delete also very old past events (we do not keep more than 1 month record in past) // Delete also very old past events (we do not keep more than 1 month record in past)
$sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm_reminder WHERE dateremind < '".$this->db->jdate($now - (3600 * 24 * 32))."'"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm_reminder";
$sql .= " WHERE dateremind < '".$this->db->idate($now - (3600 * 24 * 32))."'";
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if (!$resql) { if (!$resql) {