--- /root/zabbix-web-1.8.10-1.el6.noarch/usr/share/zabbix/include/actions.inc.php 2011-12-28 10:27:43.000000000 +0100 +++ include/actions.inc.php 2012-02-02 17:53:33.661128104 +0100 @@ -915,10 +926,11 @@ ), 'output' => API_OUTPUT_EXTEND, 'select_mediatypes' => API_OUTPUT_EXTEND, + 'alias' => 1, 'sortfield' => 'clock', 'sortorder' => ZBX_SORT_DOWN )); foreach($alerts as $alertid => $row){ // mediatypes $mediatype = array_pop($row['mediatypes']); @@ -940,7 +953,7 @@ $status=new CSpan(S_NOT_SENT,"red"); $retries=new CSpan(0,"red"); } - $sendto=$row["sendto"]; + $sendto=array($row["sendto"],br(),"(",$row["alias"],")"); $message = array(bold(S_SUBJECT.':'),br(),$row["subject"],br(),br(),bold(S_MESSAGE.':')); $msg = explode("\n",$row['message']); --- /root/zabbix-web-1.8.10-1.el6.noarch/usr/share/zabbix/api/classes/class.calert.php 2011-12-28 10:27:43.000000000 +0100 +++ api/classes/class.calert.php 2012-02-02 17:50:41.756123836 +0100 @@ -67,6 +67,7 @@ $def_options = array( 'nodeids' => null, + 'alias' => null, 'groupids' => null, 'hostids' => null, 'alertids' => null, @@ -168,6 +169,14 @@ // nodeids $nodeids = !is_null($options['nodeids']) ? $options['nodeids'] : get_current_nodeid(); +// alias + if(!is_null($options['alias'])){ + zbx_value2array($options['alias']); + $sql_parts['select']['alias'] = 'u.alias'; + $sql_parts['from']['users'] = 'users u'; + $sql_parts['where']['user'] = 'a.userid=u.userid'; +}; + // groupids if(!is_null($options['groupids'])){ zbx_value2array($options['groupids']);