Misc minor fixes

This commit is contained in:
Deon George 2013-12-18 15:53:30 +11:00
parent c4746712e3
commit 023f22f7bf
2 changed files with 3 additions and 2 deletions

View File

@ -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:

View File

@ -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