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

vc php8

This commit is contained in:
fbsanchez 2022-01-11 14:36:05 +01:00
parent 3b6f5bd02f
commit c3639a22fb
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/general/header.php
View File

@ -206,6 +206,8 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
$select[0]['autorefresh_white_list'] $select[0]['autorefresh_white_list']
); );
$header_autorefresh = '';
$header_autorefresh_counter = '';
if ($config['legacy_vc'] if ($config['legacy_vc']
|| ($_GET['sec2'] !== 'operation/visual_console/render_view') || ($_GET['sec2'] !== 'operation/visual_console/render_view')
|| (($_GET['sec2'] !== 'operation/visual_console/render_view') || (($_GET['sec2'] !== 'operation/visual_console/render_view')
@ -900,6 +902,7 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
if ($_GET['refr'] if ($_GET['refr']
|| (isset($do_refresh) === true && $do_refresh === true) || (isset($do_refresh) === true && $do_refresh === true)
) { ) {
$autorefresh_draw = false;
if ($_GET['sec2'] == 'operation/events/events') { if ($_GET['sec2'] == 'operation/events/events') {
$autorefresh_draw = true; $autorefresh_draw = true;
} }

2
pandora_console/include/functions_agents.php
View File

@ -1374,7 +1374,7 @@ function agents_get_group_agents(
$key = $row['id_agente']; $key = $row['id_agente'];
} }
if ($row['id_server'] !== '') { if (($row['id_server'] ?? '') !== '') {
if (is_metaconsole()) { if (is_metaconsole()) {
$server_name = db_get_row_filter( $server_name = db_get_row_filter(
'tmetaconsole_setup', 'tmetaconsole_setup',

8
pandora_console/include/rest-api/models/VisualConsole/Item.php
View File

@ -243,10 +243,10 @@ class Item extends CachedModel
} }
$decodedData['agentDisabled'] = static::parseBool( $decodedData['agentDisabled'] = static::parseBool(
$data['agentDisabled'] ($data['agentDisabled'] ?? false)
); );
$decodedData['moduleDisabled'] = static::parseBool( $decodedData['moduleDisabled'] = static::parseBool(
$data['moduleDisabled'] ($data['moduleDisabled'] ?? false)
); );
return $decodedData; return $decodedData;
@ -1097,8 +1097,8 @@ class Item extends CachedModel
$baseUrl = \ui_get_full_url('index.php'); $baseUrl = \ui_get_full_url('index.php');
$mobileUrl = \ui_get_full_url('mobile/index.php'); $mobileUrl = \ui_get_full_url('mobile/index.php');
if ((bool) $data['agentDisabled'] === true if ((bool) ($data['agentDisabled'] ?? null) === true
|| (bool) $data['moduleDisabled'] === true || (bool) ($data['moduleDisabled'] ?? null) === true
) { ) {
return null; return null;
} }

4
pandora_console/operation/visual_console/public_view.php
View File

@ -63,7 +63,7 @@ require_once 'include/functions_visual_map.php';
$hash = (string) get_parameter('hash'); $hash = (string) get_parameter('hash');
$visualConsoleId = (int) get_parameter('id_layout'); $visualConsoleId = (int) get_parameter('id_layout');
$config['id_user'] = (string) get_parameter('id_user'); $config['id_user'] = (string) get_parameter('id_user');
$refr = (int) get_parameter('refr', $config['refr']); $refr = (int) get_parameter('refr', ($config['refr'] ?? null));
if (!isset($config['pure'])) { if (!isset($config['pure'])) {
$config['pure'] = 0; $config['pure'] = 0;
@ -180,7 +180,7 @@ $visualConsoleItems = VisualConsole::getItemsFromDB(
<script type="text/javascript"> <script type="text/javascript">
var container = document.getElementById("visual-console-container"); var container = document.getElementById("visual-console-container");
var props = <?php echo (string) $visualConsole; ?>; var props = <?php echo (string) $visualConsole; ?>;
var items = <?php echo '['.implode($visualConsoleItems, ',').']'; ?>; var items = <?php echo '['.implode(',', $visualConsoleItems).']'; ?>;
var baseUrl = "<?php echo ui_get_full_url('/', false, false, false); ?>"; var baseUrl = "<?php echo ui_get_full_url('/', false, false, false); ?>";
var controls = document.getElementById('vc-controls'); var controls = document.getElementById('vc-controls');