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

Fix bad calculation of email for notifications

Browse Source
This commit is contained in:
Laurent Destailleur 2015-03-25 14:51:12 +01:00
parent cc2d86bd58
commit 21b1f7cc26
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/core/class/notify.class.php
View File

@ -91,7 +91,8 @@ class Notify
$error=0; $error=0;
$num=0; $num=0;
$valueforthreshold = $object->total_ht; $valueforthreshold = 0;
if (is_object($object)) $valueforthreshold = $object->total_ht;
if (! $error) if (! $error)
{ {
@ -103,8 +104,11 @@ class Notify
$sql.= " WHERE n.fk_contact = c.rowid"; $sql.= " WHERE n.fk_contact = c.rowid";
$sql.= " AND a.rowid = n.fk_action"; $sql.= " AND a.rowid = n.fk_action";
$sql.= " AND n.fk_soc = s.rowid"; $sql.= " AND n.fk_soc = s.rowid";
if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode; // Old usage if ($notifcode)
else $sql.= " AND a.code = '".$notifcode."'"; // New usage {
if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode; // Old usage
else $sql.= " AND a.code = '".$notifcode."'"; // New usage
}
$sql.= " AND s.entity IN (".getEntity('societe', 1).")"; $sql.= " AND s.entity IN (".getEntity('societe', 1).")";
if ($socid > 0) $sql.= " AND s.rowid = ".$socid; if ($socid > 0) $sql.= " AND s.rowid = ".$socid;
@ -125,16 +129,21 @@ class Notify
if (! $error) if (! $error)
{ {
// List of notifications enabled for fixed email // List of notifications enabled for fixed email
foreach($conf->global as $key => $val) foreach($conf->global as $key => $val)
{ {
if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue; if ($notifcode)
{
if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
}
else
{
if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
}
$threshold = (float) $reg[1]; $threshold = (float) $reg[1];
if ($valueforthreshold <= $threshold) if ($valueforthreshold < $threshold) continue;
{
continue;
}
$tmpemail=explode(',',$val); $tmpemail=explode(',',$val);
$num+=count($tmpemail); $num+=count($tmpemail);