DTux/moha
1
0
Fork 0
Code Activity

debbuging

Browse Source
This commit is contained in:
Daniel Tartavel
2022-09-09 16:53:49 +02:00
parent 918a571b5c
commit 5b4d6ba9d5
4 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
moha.php
View File

@ -76,14 +76,19 @@ function notify($message, $device)
global $notificationMethods, $defaultUser;
$result = false;
$destinataire = array();
if (empty($device))
logger(DEBUG, _("notify function "), __FILE__ . ":" . __LINE__);
if (empty($device) or !isset($device))
{
$destinataire[] = reset($defaultUser); //default user if no device
logger(DEBUG, _("notify: destinataire ==>") . print_r($destinataire, true), __FILE__ . ":" . __LINE__);
}else
{
//TODO destinataire selon fichier de config
if (empty($device->users))
{
logger(DEBUG, _("notify: pas d'utilisateur pour ce device"), true, __FILE__ . ":" . __LINE__);
foreach($defaultUser as $topic => $nom)
{
if ( str_contains($device->friendlyName, $topic))
@ -101,7 +106,7 @@ function notify($message, $device)
{
foreach($destinataire as $dest)
{
$result = $result | $value->send($message, $dest);
$result |= $value->send($message, $dest);
}
}
return $result;
@ -111,6 +116,7 @@ function logger($level, $log, $pos = "", $device=null, $notif = true)
{
global $logFh, $logLevel, $notificationLevel, $logLevels;
$logString = $logLevels[$level] . " " ;
if ($pos !== false)
{
$logString .= $pos;
@ -124,9 +130,10 @@ function logger($level, $log, $pos = "", $device=null, $notif = true)
$test = $level & $notificationLevel;
if (($test != 0) and ($notif === true))
{
echo _("logger: Notification to user") . __FILE__ . ":" . __LINE__;
if(notify("Moha\n" . $logString, $device) === false)
{
logger(INFO, _("Notification not sent"), __FILE__ . ":" . __LINE__, false);
echo _("logger; Notification not sent") . __FILE__ . ":" . __LINE__;
return true;
}
}