tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed html group 

Former-commit-id: a7b9fdccad8d62783ef2a547a72cc86d5ebc7f46
This commit is contained in:
Daniel Maya 2019-04-22 17:39:57 +02:00
parent d4eca50996
commit 713212a435
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pandora_console/include/rest-api/models/VisualConsole/Items/Group.php
View File

@ -19,6 +19,13 @@ final class Group extends Item
*/ */
protected static $useLinkedVisualConsole = true; protected static $useLinkedVisualConsole = true;
/**
* Used to decide wether to validate, extract and encode HTML output or not.
*
* @var boolean
*/
protected static $useHtmlOutput = true;
/** /**
* Returns a valid representation of the model. * Returns a valid representation of the model.
@ -34,7 +41,8 @@ final class Group extends Item
$return = parent::decode($data); $return = parent::decode($data);
$return['type'] = GROUP_ITEM; $return['type'] = GROUP_ITEM;
$return['groupId'] = static::extractGroupId($data); $return['groupId'] = static::extractGroupId($data);
if (!isset($return['encodedHtml']) === true) { $return['showStatistics'] = static::extractShowStatistics($data);
if (!$return['showStatistics']) {
$return['imageSrc'] = static::extractImageSrc($data); $return['imageSrc'] = static::extractImageSrc($data);
$return['statusImageSrc'] = static::extractStatusImageSrc($data); $return['statusImageSrc'] = static::extractStatusImageSrc($data);
} }
@ -174,6 +182,7 @@ final class Group extends Item
$showStatistics = static::extractShowStatistics($data); $showStatistics = static::extractShowStatistics($data);
if ($showStatistics) { if ($showStatistics) {
$isMetaconsole = is_metaconsole();
// Retrieve the agent stats. // Retrieve the agent stats.
$agentsCritical = \agents_get_agents( $agentsCritical = \agents_get_agents(
[ [
@ -185,7 +194,7 @@ final class Group extends Item
false, false,
false, false,
true, true,
true $isMetaconsole
); );
$numCritical = $agentsCritical[0]['total']; $numCritical = $agentsCritical[0]['total'];
$agentsWarning = \agents_get_agents( $agentsWarning = \agents_get_agents(
@ -198,7 +207,7 @@ final class Group extends Item
false, false,
false, false,
true, true,
true $isMetaconsole
); );
$numWarning = $agentsWarning[0]['total']; $numWarning = $agentsWarning[0]['total'];
$agentsUnknown = \agents_get_agents( $agentsUnknown = \agents_get_agents(
@ -211,7 +220,7 @@ final class Group extends Item
false, false,
false, false,
true, true,
true $isMetaconsole
); );
$numUnknown = $agentsUnknown[0]['total']; $numUnknown = $agentsUnknown[0]['total'];
$agentsOk = \agents_get_agents( $agentsOk = \agents_get_agents(
@ -224,7 +233,7 @@ final class Group extends Item
false, false,
false, false,
true, true,
true $isMetaconsole
); );
$numNormal = $agentsOk[0]['total']; $numNormal = $agentsOk[0]['total'];
@ -243,8 +252,6 @@ final class Group extends Item
(int) $data['width'], (int) $data['width'],
(int) $data['height'] (int) $data['height']
); );
// Enable the HTML management.
static::$useHtmlOutput = true;
} else { } else {
// Get the status img src. // Get the status img src.
$status = \groups_get_status($groupId); $status = \groups_get_status($groupId);
@ -267,6 +274,8 @@ final class Group extends Item
$data['width'] = $sizeImage[0]; $data['width'] = $sizeImage[0];
$data['height'] = $sizeImage[1]; $data['height'] = $sizeImage[1];
} }
$data['html'] = '<table></table>';
} }
return $data; return $data;