diff --git a/application/classes/Panel/NessD8.php b/application/classes/Panel/NessD8.php index 676f273..5dcb75f 100644 --- a/application/classes/Panel/NessD8.php +++ b/application/classes/Panel/NessD8.php @@ -43,7 +43,7 @@ class Panel_NessD8 extends Panel { // Duress Alarm case 121: - return (($this->_eo->equal() == 1) AND ($this->_eo->area() == '01') AND ($this->_eo->info() == '030')) ? 'Duress Alaram' : 'Unknown Alarm '.$this->_eo->etype(); + return (($this->_eo->equal() == 1) AND ($this->_eo->area() == '01') AND ($this->_eo->info() == '030')) ? 'Duress Alarm' : 'Unknown Alarm '.$this->_eo->etype(); // Alarm case 130: diff --git a/panel.sh b/panel.sh index c71a5ad..59781b5 100755 --- a/panel.sh +++ b/panel.sh @@ -3,9 +3,10 @@ echo $@ > /tmp/panel.sh.log CONFIG=/etc/asterisk/alarmreceiver.conf DIR=$(/bin/grep eventspooldir ${CONFIG} 2>/dev/null|awk -F= '{print $2}' | sed -e 's/\ *//') +cd /var/www/html/halmon [ -z "${DIR}" ] && echo "Cant find Alarm Dir in Config ${CONFIG}" && exit 1; for i in $(ls -1 ${DIR}/event-* 2>/dev/null); do - /usr/bin/php index.php task:load --file=${i} + /usr/bin/php index.php event:load --file=${i} done