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

Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery

This commit is contained in:
fbsanchez 2020-09-22 16:56:11 +02:00
parent 4394a8cf6a 1ca73c5456
commit 4ceeb61c87
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/extensions/resource_exportation.php
View File

@ -379,7 +379,7 @@ function get_name_xml_resource($hook_enterprise)
break;
}
$file = $name.'.ptr';
$file = io_safe_output($name).'.ptr';
return $file;
}

5
pandora_console/general/cg_items.php
View File

@ -1,4 +1,5 @@
<?php
$stacked = db_get_sql('select stacked from tgraph where id_graph = '.$_GET['data']);
$num_items = db_get_sql('select count(*) from tgraph_source where id_graph = '.$_GET['data']);
$data = (int) get_parameter('data');
$stacked = db_get_sql('select stacked from tgraph where id_graph = '.$data);
$num_items = db_get_sql('select count(*) from tgraph_source where id_graph = '.$data);
echo "$stacked,$num_items";

11
pandora_console/godmode/groups/group_list.php
View File

@ -135,7 +135,7 @@ if (is_ajax()) {
}
if ($search != '') {
$filter['string'] = $search;
$filter['aliasRegex'] = $search;
}
if ($status_agents != AGENT_STATUS_ALL) {
@ -170,6 +170,15 @@ if (is_ajax()) {
$force_serialized
);
$agents_aux = [];
foreach ($agents as $key => $value) {
if (preg_match('/'.$search.'/', io_safe_output($value))) {
$agents_aux[$key] = $value;
}
}
$agents = $agents_aux;
$agents_disabled = [];
// Add keys prefix.
if ($keys_prefix !== '') {

6
pandora_console/include/class/Diagnostics.class.php
View File

@ -283,7 +283,7 @@ class Diagnostics extends Wizard
$return .= '</div>';
}
return $return;
return false;
}
@ -1596,7 +1596,7 @@ class Diagnostics extends Wizard
}
}
return $result;
return true;
}
@ -1882,7 +1882,7 @@ class Diagnostics extends Wizard
$inputs = [];
$inputs[] = [
'label' => __('What happened').'?',
'label' => __('What happened?'),
'id' => 'div-what-happened',
'class' => 'flex-row',
'arguments' => [