Index: include/locales/en_gb.inc.php =================================================================== --- include/locales/en_gb.inc.php (revision 18027) +++ include/locales/en_gb.inc.php (working copy) @@ -294,6 +294,7 @@ 'S_ALARM_ACKNOWLEDGES_BIG'=> 'ALARM ACKNOWLEDGES', 'S_ACKNOWLEDGE_ADDED'=> 'Acknowledge added', 'S_CANNOT_ACKNOWLEDGE_EVENT'=> 'Cannot acknowledge event', + 'S_NO_PERMISSION_TO_ACKNOWLEDGE' => 'You cannot acknowledge', 'S_SYS_BULK_ACKNOWLEDGE'=> '----[BULK ACKNOWLEDGE]----', 'S_BULK_ACKNOWLEDGE'=> 'Bulk acknowledge', 'S_ACKNOWLEDGE_DATE_FORMAT'=> 'd M Y H:i:s', Index: acknow.php =================================================================== --- acknow.php (revision 18027) +++ acknow.php (working copy) @@ -93,7 +93,8 @@ $options = array( 'output' => API_OUTPUT_SHORTEN, 'acknowledged' => 0, - 'triggerids' => $_REQUEST['triggers'] + 'triggerids' => $_REQUEST['triggers'], + 'editable' => 1 ); $_REQUEST['events'] = CEvent::get($options); } Index: api/classes/class.cevent.php =================================================================== --- api/classes/class.cevent.php (revision 18027) +++ api/classes/class.cevent.php (working copy) @@ -693,7 +693,8 @@ 'eventids' => $eventids, 'output' => API_OUTPUT_EXTEND, 'select_triggers' => API_OUTPUT_EXTEND, - 'preservekeys' => 1 + 'preservekeys' => 1, + 'editable' => 1 ); $allowedEvents = self::get($options); foreach($eventids as $num => $eventid){ Index: tr_status.php =================================================================== --- tr_status.php (revision 18027) +++ tr_status.php (working copy) @@ -596,7 +596,16 @@ if($config['event_ack_enable']){ if($trigger['event_count']){ - $to_ack = new CCol(array(new CLink(S_ACKNOWLEDGE, 'acknow.php?triggers[]='.$trigger['triggerid'].'&backurl='.$page['file'], 'on'), ' ('.$trigger['event_count'].')')); + $triggerEditable = CTrigger::get(array( + 'editable' => 1, + 'trigegrids' => $trigger['triggerid'], + 'output' => API_OUTPUT_SHORTEN, + )); + if (!empty($triggerEditable)) { + $to_ack = new CCol(array(new CLink(S_ACKNOWLEDGE, 'acknow.php?triggers[]='.$trigger['triggerid'].'&backurl='.$page['file'], 'on'), ' ('.$trigger['event_count'].')')); + } else { + $to_ack = new CCol(S_NO_PERMISSION_TO_ACKNOWLEDGE, 'unknown'); + } } else{ $to_ack = new CCol(S_ACKNOWLEDGED, 'off');