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

Fix merge lost

Browse Source
This commit is contained in:
Laurent Destailleur 2018-12-11 18:18:47 +01:00
parent d0fd00c4e9
commit 024e1673e3
1 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
htdocs/ticket/class/ticket.class.php
View File

@ -1495,15 +1495,17 @@ class Ticket extends CommonObject
* 1- create entry into database for message storage
* 2- if trigger, send an email to ticket contacts
*
* @param User $user User that create
* @param string $message Log message
* @param int $noemail 0=send email after, 1=disable emails
* @return int <0 if KO, >0 if OK
* @param User $user User that create
* @param string $message Log message
* @param int $noemail 0=send email after, 1=disable emails
* @return int <0 if KO, >0 if OK
*/
public function createTicketLog(User $user, $message, $noemail = 0)
{
global $conf, $langs;
$error = 0;
$this->db->begin();
// Clean parameters
@ -1515,37 +1517,23 @@ class Ticket extends CommonObject
return -1;
}
// Insert request
$sql = "INSERT INTO " . MAIN_DB_PREFIX . "ticket_logs(";
$sql .= "entity,";
$sql .= "datec,";
$sql .= "fk_track_id,";
$sql .= "fk_user_create,";
$sql .= "message";
$sql .= ") VALUES (";
$sql .= " " . $conf->entity . ",";
$sql .= " '" . $this->db->idate(dol_now()) . "',";
$sql .= " '" . $this->db->escape($this->track_id) . "',";
$sql .= " " . ($user->id > 0 ? $user->id : 'NULL') . ",";
$sql .= " '" . $this->db->escape($message) . "'";
$sql .= ")";
// TODO Should call the trigger TICKET_MODIFY with $this->context with all data to record event
// so the event is stored by the agenda/event trigger
dol_syslog(get_class($this) . "::create_ticket_log sql=" . $sql, LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql) {
if ($conf->global->TICKET_ACTIVATE_LOG_BY_EMAIL && !$noemail) {
$this->sendLogByEmail($user, $message);
}
if (!$error) {
$this->db->commit();
if (!$error) {
$this->db->commit();
return 1;
}
} else {
$this->db->rollback();
$this->error = "Error " . $this->db->lasterror();
dol_syslog(get_class($this) . "::create_ticket_log " . $this->error, LOG_ERR);
return -1;
if ($conf->global->TICKET_ACTIVATE_LOG_BY_EMAIL && !$noemail) {
$this->sendLogByEmail($user, $message);
}
return 1;
}
else
{
$this->db->rollback();
return -1;
}
}