Bernhard.Linz/mailGraph
1
0
Fork 0
mirror of https://github.com/moudsen/mailGraph synced 2025-01-30 20:01:38 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugfixes - v1.10

Browse Source
This commit is contained in:
Mark Oudsen 2021-02-27 17:17:54 +01:00
parent fb04fb7d1f
commit 86b9070de5
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mailGraph.php
View File

@ -125,6 +125,7 @@
global $z_images_path; global $z_images_path;
global $z_url_api; global $z_url_api;
global $cVersion; global $cVersion;
global $cCRLF;
// Unique names // Unique names
$thisTime = time(); $thisTime = time();
@ -161,11 +162,18 @@
curl_setopt($ch, CURLOPT_COOKIEFILE, $filename_cookie); curl_setopt($ch, CURLOPT_COOKIEFILE, $filename_cookie);
// Login to Zabbix // Login to Zabbix
curl_exec($ch); $login = curl_exec($ch);
if ($login!='')
{
echo 'Error logging in to Zabbix!'.$cCRLF;
die;
}
// Get the graph // Get the graph
curl_setopt($ch, CURLOPT_URL, $z_url_fetch); curl_setopt($ch, CURLOPT_URL, $z_url_fetch);
$output = curl_exec($ch); $output = curl_exec($ch);
curl_close($ch); curl_close($ch);
// Delete cookie // Delete cookie
@ -642,7 +650,7 @@
$mailData['TRIGGER_URL'] = $z_server.'/triggers.php?form=update&triggerid='.$mailData['TRIGGER_ID']; $mailData['TRIGGER_URL'] = $z_server.'/triggers.php?form=update&triggerid='.$mailData['TRIGGER_ID'];
$mailData['ITEM_URL'] = $z_server.'/items.php?form=update&hostid='.$mailData['HOST_ID'].'&itemid='.$mailData['ITEM_ID']; $mailData['ITEM_URL'] = $z_server.'/items.php?form=update&hostid='.$mailData['HOST_ID'].'&itemid='.$mailData['ITEM_ID'];
$mailData['HOST_URL'] = $z_server.'/zabbix/hosts.php?form=update&hostid='.$mailData['HOST_ID']; $mailData['HOST_URL'] = $z_server.'/zabbix/hosts.php?form=update&hostid='.$mailData['HOST_ID'];
$mailData['EVENTDETAILS_URL'] = $z_server.'/tr_events.php?triggerid='.$mailData['TRIGGER_ID'].'&eventid='.$mailData['EVENT_ID'].'"'; $mailData['EVENTDETAILS_URL'] = $z_server.'/tr_events.php?triggerid='.$mailData['TRIGGER_ID'].'&eventid='.$mailData['EVENT_ID'];
$mailData['EVENT_DURATION'] = getNiceDuration($p_duration); $mailData['EVENT_DURATION'] = getNiceDuration($p_duration);
@ -718,7 +726,7 @@
// Return TAG information // Return TAG information
$response = array('messageId'=>$messageId); $response = array('messageId.mailGraph'=>$messageId);
echo json_encode($response).$cCRLF; echo json_encode($response).$cCRLF;
// Store log? // Store log?