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

Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round

This commit is contained in:
Pablo Aragon 2023-03-10 13:03:35 +01:00
parent ceed3c5d51 f875fe674e
commit 427ecf96e4
58 changed files with 260 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/general/header.php
View File

@ -117,6 +117,7 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
}
}
$search_bar .= '<div id="result_order" class="result_order"></div>';
$search_bar .= '<input id="keywords" name="keywords"';
if (!isset($config['search_keywords'])) {
$search_bar .= "value='".__('Enter keywords to search')."'";
@ -126,13 +127,11 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
$search_bar .= "value='".$config['search_keywords']."'";
}
$search_bar .= 'type="search" onfocus="javascript: if (fieldKeyWordEmpty) $(\'#keywords\').val(\'\');"
onkeyup="showinterpreter()" class="search_input"/>';
$search_bar .= 'type="search" onfocus="javascript: if (fieldKeyWordEmpty) $(\'#keywords\').val(\'\');" onkeyup="showinterpreter()" class="search_input"/>';
// $search_bar .= 'onClick="javascript: document.quicksearch.submit()"';
$search_bar .= "<input type='hidden' name='head_search_keywords' value='abc' />";
$search_bar .= '</form>';
$header_searchbar = '<div id="header_searchbar">'.$search_bar.'</div>';
}

2
pandora_console/godmode/agentes/planned_downtime.editor.php
View File

@ -1452,7 +1452,7 @@ $table->data['module'][1] = "
<td class='cell_delete_button' style='text-align: right; width:10%;' id=''>".'<a class="link_delete"
onclick="if(!confirm(\''.__('Are you sure?').'\')) return false;"
href="">'.html_print_image(
'images/cross.png',
'images/delete.svg',
true,
[
'border' => '0',

2
pandora_console/godmode/alerts/alert_list.list.php
View File

@ -766,7 +766,7 @@ foreach ($simple_alerts as $alert) {
$data[3] .= '</form>';
$data[3] .= html_print_input_image(
'update_action',
'images/config.png',
'images/edit.svg',
1,
'padding:0px;',
true,

2
pandora_console/godmode/events/event_filter.php
View File

@ -186,7 +186,7 @@ foreach ($filters as $filter) {
) {
$table->cellclass[][6] = 'table_action_buttons';
$data[6] = "<a onclick='if(confirm(\"".__('Are you sure?')."\")) return true; else return false;'href='index.php?sec=geventos&sec2=godmode/events/events&section=filter&delete=1&id=".$filter['id_filter'].'&offset=0&pure='.$config['pure']."'>".html_print_image(
'images/cross.png',
'images/delete.svg',
true,
[
'title' => __('Delete'),

10
pandora_console/godmode/gis_maps/configure_gis_map.php
View File

@ -698,7 +698,7 @@ echo '</form>';
<td><a id="delete_row" href="none">
<?php
html_print_image(
'images/cross.png',
'images/delete.svg',
false,
[
'alt' => '',
@ -1005,7 +1005,7 @@ function getAgentRow (layerId, agentId, agentAlias) {
var $deleteCol = $("<td />");
var $agentAlias = $("<span class=\"agent_alias\" data-agent-id=\"" + agentId + "\">" + agentAlias + "</span>");
var $removeBtn = $('<a class="delete_row" href="javascript:" <?php echo html_print_image('images/cross.png', false, ['class' => 'invert_filter']); ?> </a>');
var $removeBtn = $('<a class="delete_row" href="javascript:" <?php echo html_print_image('images/delete.svg', false, ['class' => 'invert_filter']); ?> </a>');
$removeBtn.click(function (event) {
var $layerRow = $("tr#layer_row_" + layerId);
@ -1061,7 +1061,7 @@ function getGroupRow (layerId, groupId, groupName, agentId, agentAlias) {
+ "<i>" + agentAlias + "</i>"
+ ")"
+ "</span>");
var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/cross.png', true, ['class' => 'invert_filter']); ?></a>');
var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/delete.svg', true, ['class' => 'invert_filter']); ?></a>');
$removeBtn.click(function (event) {
var $layerRow = $("tr#layer_row_" + layerId);
@ -1139,8 +1139,8 @@ function getLayerRow (layerId, layerData) {
var $layerName = $("<span class=\"layer_name\">" + layerData.name + "</span>");
var $sortUpBtn = $("<a class=\"up_arrow\" href=\"javascript:;\" />");
var $sortDownBtn = $("<a class=\"down_arrow\" href=\"javascript:;\" />");
var $editBtn = $('<a class="edit_layer" href="javascript:;"><?php echo html_print_image('images/config.png', true, ['class' => 'invert_filter']); ?></a>');
var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/cross.png', true, ['class' => 'invert_filter']); ?></a>');
var $editBtn = $('<a class="edit_layer" href="javascript:;"><?php echo html_print_image('images/edit.svg', true, ['class' => 'invert_filter']); ?></a>');
var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/delete.svg', true, ['class' => 'invert_filter']); ?></a>');
$sortUpBtn.click(moveLayerRowUpOnClick);
$sortDownBtn.click(moveLayerRowDownOnClick);

10
pandora_console/godmode/massive/massive_operations.php
View File

@ -216,7 +216,7 @@ if ($option == '') {
$alertstab = [
'text' => '<a href="'.$url.'&tab=massive_alerts">'.html_print_image(
'images/bell.png',
'images/alert@svg.svg',
true,
[
'title' => __('Alerts operations'),
@ -228,7 +228,7 @@ $alertstab = [
$userstab = [
'text' => '<a href="'.$url.'&tab=massive_users">'.html_print_image(
'images/user.png',
'images/user.svg',
true,
[
'title' => __('Users operations'),
@ -240,7 +240,7 @@ $userstab = [
$agentstab = [
'text' => '<a href="'.$url.'&tab=massive_agents">'.html_print_image(
'images/agent.png',
'images/agents@svg.svg',
true,
[
'title' => __('Agents operations'),
@ -252,7 +252,7 @@ $agentstab = [
$modulestab = [
'text' => '<a href="'.$url.'&tab=massive_modules">'.html_print_image(
'images/module.png',
'images/modules@svg.svg',
true,
[
'title' => __('Modules operations'),
@ -264,7 +264,7 @@ $modulestab = [
$pluginstab = [
'text' => '<a href="'.$url.'&tab=massive_plugins">'.html_print_image(
'images/plugin.png',
'images/plugins@svg.svg',
true,
[
'title' => __('Plugins operations'),

2
pandora_console/godmode/modules/manage_network_components_form_wizard.php
View File

@ -104,7 +104,7 @@ function generateExtraFields($extra_fields, $protocol)
'class' => 'float-right',
'style' => $cntFields <= 1 ? 'opacity: 0.5;' : '',
'content' => html_print_image(
'images/cross.png',
'images/delete.svg',
true,
[
'title' => __('Remove last macro oid'),

4
pandora_console/godmode/modules/manage_network_templates.php
View File

@ -266,7 +266,7 @@ foreach ($result as $row) {
$table->cellclass[][3] = 'table_action_buttons';
$data[3] = html_print_input_image(
'delete_profile',
'images/cross.png',
'images/delete.svg',
$row['id_np'],
'',
true,
@ -286,7 +286,7 @@ foreach ($result as $row) {
'class' => 'invert_filter',
]
);
$data[3] = '<a href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates'.'&delete_profile=1&delete_profile='.$row['id_np'].'" '.'onclick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
$data[3] = '<a href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates'.'&delete_profile=1&delete_profile='.$row['id_np'].'" '.'onclick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
$data[3] .= '<a onclick="blockResubmit($(this))" href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates'.'&export_profile='.$row['id_np'].'">'.html_print_image('images/csv.png', true, ['title' => __('Export to CSV'), 'class' => 'invert_filter']).'</a>';
array_push($table->data, $data);

2
pandora_console/godmode/netflow/nf_edit.php
View File

@ -191,7 +191,7 @@ foreach ($filters as $filter) {
if (check_acl_restricted_all($config['id_user'], $filter['id_group'], 'AW')) {
$table->cellclass[][3] = 'table_action_buttons';
$data[3] = "<a onclick='if(confirm(\"".__('Are you sure?')."\")) return true; else return false;'
href='".$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_edit&delete=1&id='.$filter['id_sg']."&offset=0&pure=$pure'>".html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
href='".$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_edit&delete=1&id='.$filter['id_sg']."&offset=0&pure=$pure'>".html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
}
array_push($table->data, $data);

4
pandora_console/godmode/netflow/nf_item_list.php
View File

@ -30,7 +30,7 @@ $buttons['report_items']['active'] = true;
$buttons['report_items']['text'] = '<a href="'.$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_item_list&id='.$id.'">'.html_print_image('images/god6.png', true, ['title' => __('Report items')]).'</a>';
$buttons['edit_report']['active'] = false;
$buttons['edit_report']['text'] = '<a href="'.$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_report_form&id='.$id.'">'.html_print_image('images/config.png', true, ['title' => __('Edit report')]).'</a>';
$buttons['edit_report']['text'] = '<a href="'.$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_report_form&id='.$id.'">'.html_print_image('images/edit.svg', true, ['title' => __('Edit report')]).'</a>';
// Header
if (! defined('METACONSOLE')) {
@ -260,7 +260,7 @@ foreach ($reports_item as $item) {
}
$data[5] = "<a onclick='if(confirm(\"".__('Are you sure?')."\")) return true; else return false;'
href='".$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_item_list&delete=1&id_rc='.$item['id_rc'].'&id='.$id."&offset=0'>".html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>'.html_print_checkbox_extended('delete_multiple[]', $item['id_rc'], false, false, '', 'class="check_delete"', true);
href='".$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_item_list&delete=1&id_rc='.$item['id_rc'].'&id='.$id."&offset=0'>".html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>'.html_print_checkbox_extended('delete_multiple[]', $item['id_rc'], false, false, '', 'class="check_delete"', true);
array_push($table->data, $data);
}

12
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -4272,7 +4272,7 @@ function print_SLA_list($width, $action, $idItem=null)
echo '</td>';
echo '<td class="sla_list_action_col center">';
echo '<a href="javascript: deleteSLARow('.$item['id'].');">';
echo html_print_image('images/cross.png', true, ['class' => 'invert_filter']);
echo html_print_image('images/delete.svg', true, ['class' => 'invert_filter']);
echo '</a>';
echo '</td>';
echo '</tr>';
@ -4313,7 +4313,7 @@ function print_SLA_list($width, $action, $idItem=null)
<a class="delete_button" href="javascript: deleteSLARow(0);">
<?php
html_print_image(
'images/cross.png',
'images/delete.svg',
false,
['class' => 'invert_filter']
);
@ -4739,7 +4739,7 @@ function print_General_list($width, $action, $idItem=null, $type='general')
<td>'.printSmallFont($nameAgentFailover).$server_name_element.'</td>
<td>'.printSmallFont($nameModuleFailover).'</td>
<td class="center">
<a href="javascript: deleteGeneralRow('.$item['id'].');">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>
<a href="javascript: deleteGeneralRow('.$item['id'].');">'.html_print_image('images/delete.svg', true, ['class' => 'invert_filter']).'</a>
</td>
</tr>';
} else {
@ -4747,7 +4747,7 @@ function print_General_list($width, $action, $idItem=null, $type='general')
<td>'.printSmallFont($nameAgent).$server_name_element.'</td>
<td>'.printSmallFont($nameModule).'</td>
<td class="center">
<a href="javascript: deleteGeneralRow('.$item['id'].');">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>
<a href="javascript: deleteGeneralRow('.$item['id'].');">'.html_print_image('images/delete.svg', true, ['class' => 'invert_filter']).'</a>
</td>
</tr>';
}
@ -4757,7 +4757,7 @@ function print_General_list($width, $action, $idItem=null, $type='general')
<td>'.printSmallFont($nameModule).'</td>
<td>'.printSmallFont($operation[$item['operation']]).'</td>
<td class="center">
<a href="javascript: deleteGeneralRow('.$item['id'].');">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>
<a href="javascript: deleteGeneralRow('.$item['id'].');">'.html_print_image('images/delete.svg', true, ['class' => 'invert_filter']).'</a>
</td>
</tr>';
}
@ -4795,7 +4795,7 @@ function print_General_list($width, $action, $idItem=null, $type='general')
<a class="delete_button" href="javascript: deleteGeneralRow(0);">
<?php
html_print_image(
'images/cross.png',
'images/delete.svg',
false,
['class' => 'invert_filter']
);

2
pandora_console/godmode/setup/gis.php
View File

@ -84,7 +84,7 @@ if ($mapsConnections !== false) {
'<a href="index.php?sec=gsetup&sec2=godmode/setup/gis_step_2&amp;action=edit_connection_map&amp;id_connection_map='.$mapsConnection['id_tmap_connection'].'">'.$mapsConnection['conection_name'].'</a>',
ui_print_group_icon($mapsConnection['group_id'], true),
'<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=gis&amp;id_connection_map='.$mapsConnection['id_tmap_connection'].'&amp;action=delete_connection"
onClick="javascript: if (!confirm(\''.__('Do you wan delete this connection?').'\')) return false;">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>',
onClick="javascript: if (!confirm(\''.__('Do you wan delete this connection?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['class' => 'invert_filter']).'</a>',
];
$table->cellclass[][2] = 'table_action_buttons';
}

2
pandora_console/godmode/setup/links.php
View File

@ -208,7 +208,7 @@ if ((isset($_GET['form_add'])) or (isset($_GET['form_edit']))) {
echo "<tr><td class='$tdcolor'><b><a href='index.php?sec=gsetup&sec2=godmode/setup/links&form_edit=1&id_link=".$row['id_link']."'>".$row['name'].'</a></b></td>';
echo '<td class="'.$tdcolor.' table_action_buttons"><a href="index.php?sec=gsetup&sec2=godmode/setup/links&id_link='.$row['id_link'].'&borrar='.$row['id_link'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image(
'images/cross.png',
'images/delete.svg',
true,
['class' => 'invert_filter']
).'</a></td></tr>';

2
pandora_console/godmode/setup/news.php
View File

@ -373,7 +373,7 @@ if ((isset($_GET['form_add'])) || (isset($_GET['form_edit']))) {
echo "<td class='$tdcolor'>".__('No').'</b></td>';
}
echo '<td class="'.$tdcolor.' table_action_buttons"><a href="index.php?sec=gsetup&sec2=godmode/setup/news&id_news='.$row['id_news'].'&borrar='.$row['id_news'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['border' => '0', 'class' => 'invert_filter']).'</a></td></tr>';
echo '<td class="'.$tdcolor.' table_action_buttons"><a href="index.php?sec=gsetup&sec2=godmode/setup/news&id_news='.$row['id_news'].'&borrar='.$row['id_news'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['border' => '0', 'class' => 'invert_filter']).'</a></td></tr>';
}
echo '</table>';

2
pandora_console/godmode/setup/snmp_wizard.php
View File

@ -107,7 +107,7 @@ html_print_table($table);
function cell_op($oid='')
{
return '<img class="loading invisible" src="'.'images/spinner.gif'.'" />'.'<a class="button_edit_snmp" href="javascript: edit_snmp(\''.$oid.'\');">'.html_print_image('images/cog.png', true, ['class' => 'invert_filter', 'title' => __('Edit')]).'</a>'.'<a class="delete_button_snmp" href="javascript: delete_snmp(\''.$oid.'\');">'.html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
return '<img class="loading invisible" src="'.'images/spinner.gif'.'" />'.'<a class="button_edit_snmp" href="javascript: edit_snmp(\''.$oid.'\');">'.html_print_image('images/cog.png', true, ['class' => 'invert_filter', 'title' => __('Edit')]).'</a>'.'<a class="delete_button_snmp" href="javascript: delete_snmp(\''.$oid.'\');">'.html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
}

4
pandora_console/godmode/snmpconsole/snmp_alert.php
View File

@ -1943,7 +1943,7 @@ if ($create_alert || $update_alert) {
$data[1] .= '<tr>';
$data[1] .= '<td>'.alerts_get_alert_action_name($action['alert_type']).'</td>';
$data[1] .= '<td> <a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_action=1&action_id='.$action['id'].'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">'.html_print_image(
'images/cross.png',
'images/delete.svg',
true,
[
'border' => '0',
@ -2027,7 +2027,7 @@ if ($create_alert || $update_alert) {
[
'href' => 'javascript: ',
'content' => html_print_image(
'images/cross.png',
'images/delete.svg',
true,
[
'title' => __('Delete action'),

2
pandora_console/godmode/users/configure_user.php
View File

@ -1887,7 +1887,7 @@ echo '</div>';
// This is an image generated for JS.
$delete_image = html_print_input_image(
'del',
'images/cross.png',
'images/delete.svg',
1,
'',
true,

23
pandora_console/images/nodes@svg.svg Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: sketchtool 61.2 (101010) - https://sketch.com -->
<title>A4F45784-4263-40A4-A100-0ADD2A4AF526@svg</title>
<desc>Created with sketchtool.</desc>
<g id="Mockups" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Mockup---Inventory-v2" transform="translate(-330.000000, -482.000000)">
<g id="Base-operations" transform="translate(310.000000, 462.000000)">
<g id="Contenido" transform="translate(20.000000, 20.000000)">
<g id="Title">
<g id="Node" transform="translate(0.000000, 1.000000)">
<path d="M11.0005809,0.577602729 L17.0215369,4.05330429 C17.6403998,4.41055362 18.0216446,5.07084166 18.0216446,5.78541725 L18.0216446,12.2084379 C18.0216446,12.9225447 17.6408956,13.5824738 17.0226732,13.9398945 L10.9867915,17.429494 C10.3751132,17.7831311 9.62223302,17.7877875 9.00622741,17.4417433 L3.00985488,14.073251 C2.37954726,13.7191726 1.98939037,13.0524969 1.98939037,12.3295452 L1.98939037,5.78462237 C1.98939037,5.07047279 2.37018458,4.41051094 2.98846546,4.05310589 L8.99976366,0.578199219 C9.61866686,0.220434425 10.3814645,0.220207018 11.0005809,0.577602729 Z" id="Polygon" stroke="#3F3F3F" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
<polyline id="Path-28" stroke="#3F3F3F" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" points="3 4 10 9 10 17.6651764"></polyline>
<circle id="Oval" fill="#3F3F3F" cx="10" cy="9" r="3"></circle>
<circle id="Oval" fill="#3F3F3F" cx="3" cy="4" r="3"></circle>
<circle id="Oval" fill="#3F3F3F" cx="17" cy="4" r="3"></circle>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

20
pandora_console/images/refresh@svg.svg Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: sketchtool 61.2 (101010) - https://sketch.com -->
<title>312C8F68-5915-4989-BCE0-E39966548B2E@svg</title>
<desc>Created with sketchtool.</desc>
<g id="Mockups" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
<g id="Mockup---Module-2-default-open" transform="translate(-1857.000000, -3735.000000)" stroke="#3F3F3F" stroke-width="2">
<g id="Barra-inferior" transform="translate(0.000000, 3710.000000)">
<g id="Acciones" transform="translate(1507.000000, 10.000000)">
<g id="Principal-por-defecto" transform="translate(269.000000, 0.000000)">
<g id="Icons/Elements/update-white" transform="translate(82.000000, 16.000000)">
<polyline id="Path-10" points="10.0005064 0 10.0005064 2.98289013 7 2.98289013"></polyline>
<path d="M0.000657169914,8.00835862 C0.790778884,9.26397417 2.12630154,9.92782378 4.00722512,9.99990745 C6.76864887,9.99990745 9.00722512,7.76136573 9.00722512,4.99998457 C9.00722512,2.23860342 6.76864887,6.16977954e-05 4.00722512,6.16977954e-05 C2.36730125,6.16977954e-05 0.911775413,0.789551382 0,2.00918391" id="Oval" transform="translate(4.503613, 4.999985) scale(-1, -1) translate(-4.503613, -4.999985) "></path>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

2
pandora_console/include/ajax/module.php
View File

@ -248,7 +248,7 @@ if (check_login()) {
false,
false
);
$formtable->data[0][3] = "<a href='javascript: show_module_detail_dialog(".$module_id.', '.$agentId.', "'.$server_name.'", 0, -1,"'.modules_get_agentmodule_name($module_id)."\")'>".html_print_image('images/refresh.png', true, ['style' => 'vertical-align: middle;', 'border' => '0', 'class' => 'invert_filter' ]).'</a>';
$formtable->data[0][3] = "<a href='javascript: show_module_detail_dialog(".$module_id.', '.$agentId.', "'.$server_name.'", 0, -1,"'.modules_get_agentmodule_name($module_id)."\")'>".html_print_image('images/refresh@svg.svg', true, ['style' => 'vertical-align: middle;', 'border' => '0', 'class' => 'main_menu_icon invert_filter' ]).'</a>';
$formtable->rowspan[0][3] = 2;
$formtable->cellstyle[0][3] = 'vertical-align: middle;';

4
pandora_console/include/class/CalendarManager.class.php
View File

@ -697,7 +697,7 @@ class CalendarManager
);
$tmp->options .= '">';
$tmp->options .= html_print_image(
'images/config.png',
'images/edit.svg',
true,
[
'title' => __('Edit'),
@ -731,7 +731,7 @@ class CalendarManager
);
$tmp->options .= '">';
$tmp->options .= html_print_image(
'images/cross.png',
'images/delete.svg',
true,
[
'title' => __('Delete'),

2
pandora_console/include/class/NetworkMap.class.php
View File

@ -3246,7 +3246,7 @@ class NetworkMap
$table->data['template_row']['edit'] = '';
$table->data['template_row']['edit'] .= '<span class="edit_icon_correct" style="display: none">'.html_print_image('images/pixel_green.png', true, ['class' => 'main_menu_icon']).'</span><span class="edit_icon_fail" style="display: none" >'.html_print_image('images/dot_red.png', true).'</span><span class="edit_icon_progress" style="display: none">'.html_print_image('images/spinner.gif', true).'</span>';
// <span class="edit_icon"><a class="edit_icon_link" title="'.__('Update').'" href="#">'.html_print_image('images/config.png', true, ['class' => 'invert_filter']).'</a></span>';
// <span class="edit_icon"><a class="edit_icon_link" title="'.__('Update').'" href="#">'.html_print_image('images/edit.svg', true, ['class' => 'invert_filter']).'</a></span>';
$table->data['template_row']['edit'] .= '<a class="delete_icon" href="#">'.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter', 'style' => 'padding: 10px']).'</a>';
$table->colspan['no_relations']['0'] = 5;

2
pandora_console/include/class/SatelliteAgent.class.php
View File

@ -401,7 +401,7 @@ class SatelliteAgent extends HTML
if ($disable === false) {
$tmp->actions .= html_print_image(
($delete === true) ? 'images/add.png' : 'images/cross.png',
($delete === true) ? 'images/add.png' : 'images/delete.svg',
true,
[
'border' => '0',

2
pandora_console/include/class/SatelliteCollection.class.php
View File

@ -236,7 +236,7 @@ class SatelliteCollection extends HTML
$tmp->actions = '';
$tmp->actions .= html_print_image(
($delete === 0) ? 'images/add.png' : 'images/cross.png',
($delete === 0) ? 'images/add.png' : 'images/delete.svg',
true,
[
'border' => '0',

4
pandora_console/include/functions_container.php
View File

@ -180,7 +180,7 @@ function folder_table($graphs)
if (($report_w || $report_m) && users_can_manage_group_all($access)) {
$data[4] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/graph_builder&edit_graph=1&id='.$graph['id_graph'].'">'.html_print_image(
'images/config.png',
'images/edit.svg',
true,
['class' => 'invert_filter']
).'</a>';
@ -188,7 +188,7 @@ function folder_table($graphs)
$data[4] .= '&nbsp;';
$data[4] .= '<a href="index.php?sec=reporting&sec2=godmode/reporting/graphs&delete_graph=1&id='.$graph['id_graph'].'" onClick="if (!confirm(\''.__('Are you sure?').'\'))
return false;">'.html_print_image('images/cross.png', true, ['alt' => __('Delete'), 'title' => __('Delete'), 'class' => 'invert_filter']).'</a>'.html_print_checkbox_extended('delete_multiple[]', $graph['id_graph'], false, false, '', 'class="check_delete mrgn_lft_2px"', true);
return false;">'.html_print_image('images/delete.svg', true, ['alt' => __('Delete'), 'title' => __('Delete'), 'class' => 'invert_filter']).'</a>'.html_print_checkbox_extended('delete_multiple[]', $graph['id_graph'], false, false, '', 'class="check_delete mrgn_lft_2px"', true);
}
array_push($table->data, $data);

2
pandora_console/include/functions_gis.php
View File

@ -1585,7 +1585,7 @@ function gis_add_conection_maps_in_form($map_connection_list)
<tr class="row_0">
<td>'.html_print_input_text('map_connection_name_'.$mapConnection['id_conection'], $mapConnectionRowDB['conection_name'], '', 20, 40, true, true).'</td>
<td>'.$radioButton.'</td>
<td><a id="delete_row" href="javascript: deleteConnectionMap(\''.$mapConnection['id_conection'].'\')">'.html_print_image('images/cross.png', true, ['alt' => '', 'class' => 'invert_filter']).'</a></td>
<td><a id="delete_row" href="javascript: deleteConnectionMap(\''.$mapConnection['id_conection'].'\')">'.html_print_image('images/delete.svg', true, ['alt' => '', 'class' => 'invert_filter']).'</a></td>
</tr>
</tbody>
<script type="text/javascript">

6
pandora_console/include/functions_html.php
View File

@ -4565,6 +4565,12 @@ function html_print_image(
// Dont use safe_input here or the performance will dead.
$style = '';
if (empty($options) === false && isset($options['class']) === true) {
$options['class'] .= ' main_menu_icon';
} else {
$options['class'] = 'main_menu_icon invert_filter';
}
if (!empty($options)) {
// Deprecated or value-less attributes.
if (isset($options['align'])) {

6
pandora_console/include/functions_modules.php
View File

@ -1019,7 +1019,7 @@ function modules_format_delete($id)
$txt = '';
if (check_acl($config['id_user'], $group, 'AW') == 1) {
$txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete='.$id.'">'.html_print_image('images/cross.png', true, ['border' => '0', 'class' => 'invert_filter']).'</a>';
$txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete='.$id.'">'.html_print_image('images/delete.svg', true, ['border' => '0', 'class' => 'invert_filter']).'</a>';
}
return $txt;
@ -1040,7 +1040,7 @@ function modules_format_delete_string($id)
$txt = '';
if (check_acl($config['id_user'], $group, 'AW') == 1) {
$txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete_string='.$id.'">'.html_print_image('images/cross.png', true, ['border' => '0', 'class' => 'invert_filter']).'</a>';
$txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete_string='.$id.'">'.html_print_image('images/delete.svg', true, ['border' => '0', 'class' => 'invert_filter']).'</a>';
}
return $txt;
@ -1061,7 +1061,7 @@ function modules_format_delete_log4x($id)
$txt = '';
if (check_acl($config['id_user'], $group, 'AW') == 1) {
$txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete_log4x='.$id.'">'.html_print_image('images/cross.png', true, ['border' => '0', 'class' => 'invert_filter']).'</a>';
$txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete_log4x='.$id.'">'.html_print_image('images/delete.svg', true, ['border' => '0', 'class' => 'invert_filter']).'</a>';
}
return $txt;

17
pandora_console/include/functions_reporting.php
View File

@ -12169,24 +12169,11 @@ function reporting_get_stats_alerts($data, $links=false)
$tdata[3] = html_print_div(
[
'title' => __('Fired alerts'),
'style' => 'background-color: '.COL_CRITICAL,
'class' => 'alert_background_state main_menu_icon invert_filter',
'style' => 'background-color: '.COL_ALERTFIRED,
'class' => 'alert_background_state main_menu_icon',
],
true
);
/*
html_print_image(
'images/bell_error.png',
true,
[
'title' => __('Fired alerts'),
'class' => 'invert_filter',
],
false,
false,
false,
true
);*/
$tdata[4] = $data['monitor_alerts_fired'] <= 0 ? '-' : $data['monitor_alerts_fired'];
$tdata[4] = '<a style="color: '.COL_ALERTFIRED.';" class="big_data" href="'.$urls['monitor_alerts_fired'].'">'.$tdata[4].'</a>';
$table_al->rowclass[] = '';

33
pandora_console/include/functions_ui.php
View File

@ -708,7 +708,7 @@ function ui_print_group_icon($id_group, $return=false, $path='', $style='', $lin
if ($link === true) {
if ($tactical_view === true) {
$output = '<a href="'.$config['homeurl'].'index.php?sec=gagente&sec2=godmode/groups/tactical&id_group='.$id_group.'">';
$output = '<a href="'.$config['homeurl'].'index.php?sec=gagent&sec2=godmode/groups/tactical&id_group='.$id_group.'">';
} else {
$output = '<a href="'.$config['homeurl'].'index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=60&amp;group_id='.$id_group.'">';
}
@ -728,12 +728,13 @@ function ui_print_group_icon($id_group, $return=false, $path='', $style='', $lin
}
$icon = (str_contains($icon, '.svg') === true) ? $icon : $icon.'.svg';
$output .= html_print_image(
'images/'.$icon,
true,
[
'style' => $style,
'class' => $class,
'class' => 'main_menu_icon '.$class,
'alt' => groups_get_name($id_group, true),
'title' => groups_get_name($id_group, true),
],
@ -839,6 +840,10 @@ function ui_print_os_icon(
$subfolder .= '/so_big_icons';
}
if (isset($options['class']) === false) {
$options['class'] = 'main_menu_icon';
}
$no_in_meta = (is_metaconsole() === false);
$icon = (string) db_get_value('icon_name', 'tconfig_os', 'id_os', (int) $id_os);
@ -859,13 +864,29 @@ function ui_print_os_icon(
}
} else if ($apply_skin) {
if ($only_src) {
$output = html_print_image('images/'.$subfolder.'/'.$icon, true, $options, true, $relative, $no_in_meta, true);
$output = html_print_image(
'images/'.$subfolder.'/'.$icon,
true,
$options,
true,
$relative,
$no_in_meta,
true
);
} else {
if (!isset($options['title'])) {
$options['title'] = $os_name;
}
$output = html_print_image('images/'.$subfolder.'/'.$icon, true, $options, false, $relative, $no_in_meta, true);
$output = html_print_image(
'images/'.$subfolder.'/'.$icon,
true,
$options,
false,
$relative,
$no_in_meta,
true
);
}
} else {
// $output = "<img src='images/os_icons/" . $icon . "' alt='" . $os_name . "' title='" . $os_name . "'>";
@ -7330,7 +7351,7 @@ function ui_get_inventory_module_add_form(
$row['hidden-input'] .= html_print_input_text('hidden-custom-field-input', '', '', 25, 40, true);
$row['hidden-input'] .= '<span>&nbsp;</span>';
$row['hidden-input'] .= html_print_image(
'images/cross.png',
'images/delete.svg',
true,
[
'border' => '0',
@ -7378,7 +7399,7 @@ function ui_get_inventory_module_add_form(
$row['input'] .= '<span>&nbsp;</span>';
$row['input'] .= html_print_image(
'images/cross.png',
'images/delete.svg',
true,
[
'border' => '0',

2
pandora_console/include/help/en/help_configure_gis_map.php
View File

@ -49,7 +49,7 @@ Once the selection of the connection (or connections) is done, there is a posibi
Each map has one or more layers<sup><span class="font_75p">1</span></sup> to show the agents. Each layer can have show the agents of a <strong>group</strong> and/or a <strong>list of agents</strong>. This way it's easy to set up the agents that will be shown on each Layer.
</p>
<p>
The layers can be set as <strong>visible</strong> or <strong>hidden</strong>, and select the <strong>group</strong> with the selector or add <strong>agents</strong> with the box. Once the layer is defined (it will not be completely saved until the whole map is saved) it will be moved to the left column of defined layers, where it is possible to <strong>order</strong> (<?php html_print_image('images/up.png', false, ['alt' => 'move up icon']); ?> and <?php html_print_image('images/down.png', false, ['alt' => 'move down icon']); ?>) them, <strong>delete</strong> (<?php html_print_image('images/cross.png', false, ['alt' => 'delete icon']); ?>), or <strong>edited</strong> (<?php html_print_image('images/config.png', false, ['alt' => 'edit icon']); ?>) again.
The layers can be set as <strong>visible</strong> or <strong>hidden</strong>, and select the <strong>group</strong> with the selector or add <strong>agents</strong> with the box. Once the layer is defined (it will not be completely saved until the whole map is saved) it will be moved to the left column of defined layers, where it is possible to <strong>order</strong> (<?php html_print_image('images/up.png', false, ['alt' => 'move up icon']); ?> and <?php html_print_image('images/down.png', false, ['alt' => 'move down icon']); ?>) them, <strong>delete</strong> (<?php html_print_image('images/delete.svg', false, ['alt' => 'delete icon']); ?>), or <strong>edited</strong> (<?php html_print_image('images/edit.svg', false, ['alt' => 'edit icon']); ?>) again.
</p>
<hr/>
<sup><span class="font_75p">1</span></sup> <span class="font_85p">The default map can have 0 layers as is the one used in the agent GIS view and only uses one layer with the agent name.</span>

2
pandora_console/include/help/en/help_eventview.php
View File

@ -26,7 +26,7 @@
<div class="pdd_l_30px w150px float-left line_17px">
<h3>Actions</h3>
<?php html_print_image('images/ok.png', false, ['title' => 'Validate event', 'alt' => 'Validate event']); ?> - Validate event<br>
<?php html_print_image('images/cross.png', false, ['title' => 'Delete event', 'alt' => 'Delete event']); ?> - Delete event<br>
<?php html_print_image('images/delete.svg', false, ['title' => 'Delete event', 'alt' => 'Delete event']); ?> - Delete event<br>
<?php html_print_image('images/eye.png', false, ['title' => 'Show more', 'alt' => 'Show more']); ?> - Show more<br>
<?php html_print_image('images/hourglass.png', false, ['title' => 'In progress', 'alt' => 'In progress']); ?> - In progress
</div>

2
pandora_console/include/help/en/help_gis_map_builder.php
View File

@ -22,7 +22,7 @@ Options:
<dd>Click on the view icon to <strong>view</strong> the map.</dd>
<dt>Default radio button</dt>
<dd>Click on the <strong>radio button</strong> corresponding to the map you want to make the default to set the <strong>default map</strong> </dd>
<dt><?php html_print_image('images/cross.png', false, ['alt' => 'Delete']); ?> Delete</dt>
<dt><?php html_print_image('images/delete.svg', false, ['alt' => 'Delete']); ?> Delete</dt>
<dd>Click on the delete icon to <strong>delete</strong> the map.</dd>
<dt>Create Button</dt>
<dd>Click on Create button to <strong>create</strong> a new map.</dd>

2
pandora_console/include/help/en/help_setup_gis_index.php
View File

@ -9,5 +9,5 @@
This page is the place where the admin can configure <strong>connections to GIS Map Servers</strong>.
</p>
<p>
Here it is possible to see the list of defined connections, <strong>edit</strong> any one of them by clicking on their name, <strong>delete</strong> any connection by clicking on the delete icon (<?php html_print_image('images/cross.png', false, ['alt' => 'delete icon']); ?>) or <strong>create</strong> new connections using the create button.
Here it is possible to see the list of defined connections, <strong>edit</strong> any one of them by clicking on their name, <strong>delete</strong> any connection by clicking on the delete icon (<?php html_print_image('images/delete.svg', false, ['alt' => 'delete icon']); ?>) or <strong>create</strong> new connections using the create button.
</p>

2
pandora_console/include/help/es/help_eventview.php
View File

@ -26,7 +26,7 @@
<div class="pdd_l_30px w150px float-left line_17px">
<h3>Acciones</h3>
<?php html_print_image('images/ok.png', false, ['title' => 'Validate event', 'alt' => 'Validate event']); ?> - Validar evento<br>
<?php html_print_image('images/cross.png', false, ['title' => 'Delete event', 'alt' => 'Delete event']); ?> - Borrar evento<br>
<?php html_print_image('images/delete.svg', false, ['title' => 'Delete event', 'alt' => 'Delete event']); ?> - Borrar evento<br>
<?php html_print_image('images/eye.png', false, ['title' => 'Mostrar más', 'alt' => 'Mostrar más']); ?> - Mostrar más<br>
<?php html_print_image('images/hourglass.png', false, ['title' => 'En progreso', 'alt' => 'En progreso']); ?> - En progreso
</div>

2
pandora_console/include/help/es/help_gis_map_builder.php
View File

@ -26,7 +26,7 @@ Opciones:
<dd>Haga click en icono de visualizar para <strong>visualizar</strong> el mapa.</dd>
<dt>Botón radio por defecto</dt>
<dd>Haga click en el <strong> botón radio </strong> que se corresponda con el mapa que quiere por defecto para instalar <strong>mapa por defecto</strong> </dd>
<dt><?php html_print_image('images/cross.png', false, ['alt' => 'Delete']); ?> Eliminar</dt>
<dt><?php html_print_image('images/delete.svg', false, ['alt' => 'Delete']); ?> Eliminar</dt>
<dd>Haga click en el botón de eliminar para <strong>eliminar</strong> el mapa</dd>
<dt>Crear botón </dt>
<dd>Haga click en el Botón de Crear para <strong>crear</strong> un mapa nuevo</dd>

2
pandora_console/include/help/ja/help_configure_gis_map.php
View File

@ -57,7 +57,7 @@ GIS マップを設定するためには、少なくとも一つ選択されて
<p>
レイヤは、<strong>表示</strong>、<strong>非表示</strong>の設定ができ、<strong>グループ</strong>を選択や<strong>エージェント</strong>の追加ができます。
一度レイヤが定義されると、左側の定義済レイヤに移ります。(定義は、マップ全体が保存されるまでは保存されません。)
ここでは、再度、<strong>順番の変更</strong> (<?php html_print_image('images/up.png', false, ['alt' => 'move up icon']); ?>、<?php html_print_image('images/down.png', false, ['alt' => 'move down icon']); ?>)、<strong>削除</strong> (<?php html_print_image('images/cross.png', false, ['alt' => 'delete icon']); ?>)、<strong>編集</strong> (<?php html_print_image('images/config.png', false, ['alt' => 'edit icon']); ?>) ができます。
ここでは、再度、<strong>順番の変更</strong> (<?php html_print_image('images/up.png', false, ['alt' => 'move up icon']); ?>、<?php html_print_image('images/down.png', false, ['alt' => 'move down icon']); ?>)、<strong>削除</strong> (<?php html_print_image('images/delete.svg', false, ['alt' => 'delete icon']); ?>)、<strong>編集</strong> (<?php html_print_image('images/edit.svg', false, ['alt' => 'edit icon']); ?>) ができます。
</p>
<hr/>
<sup><span class="font_75p">1</span></sup> <span class="font_85p">デフォルトマップでは、エージェント名で一つのレイヤしか表示しない場合は、レイヤを持たない設定も可能です。</span>

2
pandora_console/include/help/ja/help_eventview.php
View File

@ -26,7 +26,7 @@
<div class="pdd_l_30px w150px float-left line_17px">
<h3>アクション</h3>
<?php html_print_image('images/ok.png', false, ['title' => '承諾する', 'alt' => '承諾する']); ?> - 承諾する<br>
<?php html_print_image('images/cross.png', false, ['title' => '削除する', 'alt' => '削除する']); ?> - 削除する<br>
<?php html_print_image('images/delete.svg', false, ['title' => '削除する', 'alt' => '削除する']); ?> - 削除する<br>
<?php html_print_image('images/page_lightning.png', false, ['title' => 'インシデントを作成する', 'alt' => 'インシデントを作成する']); ?> - インシデントを作成する
</div>

2
pandora_console/include/help/ja/help_gis_map_builder.php
View File

@ -25,7 +25,7 @@
<dd>表示アイコンをクリックすると、マップを<strong>参照</strong>できます。</dd>
<dt>デフォルトラジオボタン</dt>
<dd><strong>ラジオボタン</strong>をクリックすると、そのマップが<strong>デフォルトマップ</strong>に設定されます。</dd>
<dt><?php html_print_image('images/cross.png', false, ['alt' => 'Delete']); ?> 削除</dt>
<dt><?php html_print_image('images/delete.svg', false, ['alt' => 'Delete']); ?> 削除</dt>
<dd>削除アイコンをクリックすると、そのマップを<strong>削除</strong>します。</dd>
<dt>作成ボタン</dt>
<dd>作成ボタンをクリックすると、新しいマップを<strong>作成</strong>できます。</dd>

2
pandora_console/include/help/ja/help_setup_gis_index.php
View File

@ -11,6 +11,6 @@
<p>
設定済の利用マップ定義一覧の参照できます。
<strong>編集</strong>するにはマップ名をクリックします。
<strong>削除</strong>するには削除アイコン(<?php html_print_image('images/cross.png', false, ['alt' => 'delete icon']); ?> )をクリックします。
<strong>削除</strong>するには削除アイコン(<?php html_print_image('images/delete.svg', false, ['alt' => 'delete icon']); ?> )をクリックします。
また、新たな設定を<strong>作成</strong>するには、「作成」ボタンをクリックします。
</p>

2
pandora_console/include/javascript/pandora_events.js
View File

@ -628,7 +628,7 @@ function delete_event(table, id_evento, event_rep, row, server_id) {
},
onDeny: function() {
button.children[0];
button.children[0].src = "images/cross.png";
button.children[0].src = "images/delete.svg";
return;
}
});

2
pandora_console/include/javascript/pandora_modules.js
View File

@ -1216,7 +1216,7 @@ function delete_macro_local_component(prefix) {
//Add a new module macro
function add_macro() {
var macro_count = parseInt($("#hidden-module_macro_count").val());
var delete_icon = '<?php html_print_image ("images/cross.png", false) ?>';
var delete_icon = '<?php html_print_image ("images/delete.svg", false) ?>';
// Add inputs for the new macro
$("#module_macros").append(

8
pandora_console/include/javascript/tree/TreeController.js
View File

@ -637,7 +637,7 @@ var TreeController = {
var $content = $("<div></div>");
// Leaf icon
$leafIcon.addClass("leaf-icon invert_filter");
$leafIcon.addClass("leaf-icon");
// Content
$content.addClass("node-content");
@ -657,7 +657,7 @@ var TreeController = {
(controller.baseURL.length > 0 ? controller.baseURL : "") +
"images/" +
element.icon +
'" /></div></div>'
'" class="invert_filter"/></div></div>'
);
} else if (
typeof element.iconHTML != "undefined" &&
@ -759,7 +759,7 @@ var TreeController = {
: "") +
'images/event.svg" /> '
);
$eventImage.addClass("agent-alerts-fired");
$eventImage.addClass("agent-alerts-fired invert_filter");
$eventImage
.click(function(e) {
e.preventDefault();
@ -875,7 +875,7 @@ var TreeController = {
$content.append($statusImage);
}
var image_tooltip =
'<span><img class="invert_filter forced_title" data-title="' +
'<span class="reinvert_filter"><img class="invert_filter forced_title" data-title="' +
(element.title ? element.title : element.name) +
'" data-use_title_for_force_title="1" src="' +
(controller.baseURL.length > 0 ? controller.baseURL : "") +

4
pandora_console/include/javascript/tree/TreeControllerMeta.js
View File

@ -666,7 +666,7 @@ var TreeController = {
var $updateicon = $(
'<img src="' +
(controller.baseURL.length > 0 ? controller.baseURL : "") +
'images/config.png" class="invert_filter" style="width:18px; vertical-align: middle;"/>'
'images/edit.svg" class="invert_filter" style="width:18px; vertical-align: middle;"/>'
);
var $updatebtn = $('<a href = "' + url_edit + '"></a>').append(
$updateicon
@ -682,7 +682,7 @@ var TreeController = {
var $deleteBtn = $(
'<a><img src="' +
(controller.baseURL.length > 0 ? controller.baseURL : "") +
'images/cross.png" class="invert_filter" style="width:18px; vertical-align: middle; cursor: pointer;"/></a>'
'images/delete.svg" class="invert_filter" style="width:18px; vertical-align: middle; cursor: pointer;"/></a>'
);
$deleteBtn.click(function(event) {
var ok_function = function() {

5
pandora_console/include/styles/menu.css
View File

@ -695,3 +695,8 @@ ul li {
.head_tab_unselected span {
color: #95a3bf;
}
.logo_full {
width: 215px !important;
height: auto !important;
}

1
pandora_console/include/styles/order_interpreter.css
View File

@ -11,6 +11,7 @@ div.show_result_interpreter {
position: absolute;
z-index: 1;
width: 300px;
top: 45px;
}
.more_results {

20
pandora_console/include/styles/pandora.css
View File

@ -1135,7 +1135,11 @@ div#main {
flex-direction: column;
height: 100%;
margin: 25px;
margin-bottom: 50px;
margin-bottom: 70px;
}
div#main:has(.networkconsole) {
margin-bottom: 0px;
}
textarea.conf_editor {
@ -1431,7 +1435,7 @@ div#head {
min-width: 882px;
background-color: #fff;
color: #000;
z-index: 1;
z-index: 2;
}
.fixed_header {
@ -8132,11 +8136,11 @@ div.graph div.legend table {
.networkconsole {
width: 100%;
height: 100%;
min-height: 460px;
position: relative;
overflow: hidden;
background-color: var(--secondary-color);
min-height: calc(100vh - 235px);
min-height: calc(100vh - 200px);
border: 1px solid #cacaca;
}
/*
@ -11216,11 +11220,17 @@ table.table_modal_alternate
border-left: 0;
}
.main_menu_icon {
div.main_menu_icon,
img.main_menu_icon[src$=".svg"] {
width: 20px;
height: 20px;
}
input.main_menu_icon[src$=".svg"] {
width: 22px;
height: 22px;
}
.header_help_icon {
width: 16px;
height: 16px;

23
pandora_console/include/styles/pandora_black.css
View File

@ -74,7 +74,6 @@ div#head {
.menu_full_classic #menu_tabs {
height: 49px;
border-bottom: 1px solid #82b92e;
padding-bottom: 2px;
}
.menu_full_collapsed #menu_tabs {
@ -426,6 +425,9 @@ a.pandora_pagination {
color: #fff;
}
span.reinvert_filter {
filter: invert(1);
}
/* firts_task.css */
.new_task,
div.new_task,
@ -449,7 +451,11 @@ div.new_task > div {
}
/* tree.css */
.node-content:hover {
.tree-node div.node-content {
background-color: #444;
}
.tree-node div.node-content:hover {
background-color: #222;
}
@ -1063,10 +1069,6 @@ div.integria_details_description textarea {
}
.networkconsole {
width: 100%;
height: 100%;
position: relative;
overflow: hidden;
background-color: #111;
}
@ -1406,11 +1408,6 @@ p.trademark-copyright {
overflow: auto;
}
.action_buttons_background_mask {
background-color: #222;
border-top: 1px solid #82b92e;
}
button.buttonButton,
button.submitButton {
box-shadow: 0px 3px 6px #111;
@ -1501,3 +1498,7 @@ div.white_box.white_box_opened.no_border {
table.filter-table-adv td > div label {
color: white !important;
}
#principal_action_buttons {
background: #111111;
}

4
pandora_console/include/styles/tree.css
View File

@ -403,3 +403,7 @@ div#tree-controller-recipient {
margin-left: 5px;
border-radius: 5px;
}
.tree-node .node-icon.node-status {
border: 0;
}

8
pandora_console/include/styles/visual_maps.css
View File

@ -142,7 +142,7 @@ div#edit-controls input.sub[disabled] {
input.delete_min,
button.delete_min {
background: url(../../images/cross.png) no-repeat center;
background: url(../../images/delete.svg) no-repeat center;
}
input.delete_min[disabled],
button.delete_min[disabled] {
@ -154,7 +154,7 @@ button.delete_min_white {
}
input.delete_min_white[disabled],
button.delete_min_white[disabled] {
background: url(../../images/cross.png) no-repeat center;
background: url(../../images/delete.svg) no-repeat center;
}
input.graph_min,
@ -297,7 +297,7 @@ button.camera_min_white[disabled] {
input.config_min,
button.config_min {
background: url(../../images/config.png) no-repeat center;
background: url(../../images/edit.svg) no-repeat center;
}
input.config_min[disabled],
button.config_min[disabled] {
@ -309,7 +309,7 @@ button.config_min_white {
}
input.config_min_white[disabled],
button.config_min_white[disabled] {
background: url(../../images/config.png) no-repeat center;
background: url(../../images/edit.svg) no-repeat center;
}
input.label_min,

52
pandora_console/operation/agentes/estado_agente.php
View File

@ -1028,7 +1028,7 @@ $tableAgents->size[1] = '14%';
$tableAgents->head[2] = '<span>'.__('OS').'</span>';
$tableAgents->head[2] .= ui_get_sorting_arrows($url_up_os, $url_down_os, $selectOsUp, $selectOsDown);
$tableAgents->size[2] = '7%';
$tableAgents->size[2] = '5%';
$tableAgents->head[3] = '<span>'.__('Interval').'</span>';
$tableAgents->head[3] .= ui_get_sorting_arrows($url_up_interval, $url_down_interval, $selectIntervalUp, $selectIntervalDown);
@ -1054,16 +1054,12 @@ $tableAgents->head[9] = '<span>'.__('Last contact').'</span>';
$tableAgents->head[9] .= ui_get_sorting_arrows($url_up_last, $url_down_last, $selectLastContactUp, $selectLastContactDown);
$tableAgents->size[9] = '7%';
$tableAgents->head[10] = '<span>'.__('Last status change').'</span>';
$tableAgents->head[10] = '<span>'.__('L.S change').'</span>';
$tableAgents->head[10] .= ui_get_sorting_arrows($url_up_last_status_change, $url_down_last_status_change, $selectLastStatusChangeUp, $selectLastStatusChangeDown);
$tableAgents->size[10] = '10%';
$tableAgents->size[10] = '8%';
$tableAgents->head[11] = '<span>'.__('Remote').'</span>';
$tableAgents->head[11] .= ui_get_sorting_arrows($url_up_remote, $url_down_remote, $selectRemoteUp, $selectRemoteDown);
$tableAgents->size[11] = '7%';
$tableAgents->head[12] = '<span>'.__('Op').'</span>';
$tableAgents->size[12] = '4%';
$tableAgents->head[11] = '<span>'.__('Op').'</span>';
$tableAgents->size[11] = '6%';
$tableAgents->align = [];
@ -1076,10 +1072,10 @@ $tableAgents->align[7] = 'left';
$tableAgents->align[8] = 'left';
$tableAgents->align[9] = 'left';
$tableAgents->align[10] = 'left';
$tableAgents->align[11] = 'left';
$tableAgents->style = [];
$tableAgents->data = [];
$tableAgents->cellclass = [];
$rowPair = true;
$iterator = 0;
@ -1198,6 +1194,21 @@ foreach ($agents as $agent) {
$agent['agent_version']
);
if (enterprise_installed()) {
enterprise_include_once('include/functions_config_agents.php');
if (enterprise_hook('config_agents_has_remote_configuration', [$agent['id_agente']])) {
$data[5] .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=remote_configuration&id_agente='.$agent['id_agente'].'&disk_conf=1">'.html_print_image(
'images/remote-configuration@svg.svg',
true,
[
'align' => 'middle',
'title' => __('Remote config'),
'class' => 'invert_filter main_menu_icon',
]
).'</a>';
}
}
$data[6] = reporting_tiny_stats($agent, true, 'modules', ':', $strict_user);
$data[7] = $status_img;
@ -1216,24 +1227,9 @@ foreach ($agents as $agent) {
'status' => -1,
];
$data[11] = '';
if (enterprise_installed()) {
enterprise_include_once('include/functions_config_agents.php');
if (enterprise_hook('config_agents_has_remote_configuration', [$agent['id_agente']])) {
$data[11] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=remote_configuration&id_agente='.$agent['id_agente'].'&disk_conf=1">'.html_print_image(
'images/remote-configuration@svg.svg',
true,
[
'align' => 'middle',
'title' => __('Remote config'),
'class' => 'invert_filter main_menu_icon',
]
).'</a>';
}
}
$fb64 = base64_encode(json_encode($agent_event_filter));
$data[12] = '<a href="index.php?sec=eventos&sec2=operation/events/events&fb64='.$fb64.'">'.html_print_image(
$tableAgents->cellclass[][11] = 'table_action_buttons';
$data[11] = '<a href="index.php?sec=eventos&sec2=operation/events/events&fb64='.$fb64.'">'.html_print_image(
'images/event.svg',
true,
[
@ -1257,7 +1253,7 @@ foreach ($agents as $agent) {
$url = 'index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$agent['id_agente'];
}
$data[12] .= '<a href="'.$url.'">'.html_print_image(
$data[11] .= '<a href="'.$url.'">'.html_print_image(
'images/edit.svg',
true,
[

2
pandora_console/operation/gis_maps/gis_map.php
View File

@ -187,7 +187,7 @@ if ($maps !== false) {
}
$table->cellclass[]['op'] = 'table_action_buttons';
$data['op'] = '<a href="index.php?sec=godgismaps&amp;sec2=godmode/gis_maps/configure_gis_map&map_id='.$map['id_tgis_map'].'&amp;action=edit_map">'.html_print_image('images/config.png', true, ['title' => __('Edit')]).'</a>'.'<a href="index.php?sec=godgismaps&amp;sec2=operation/gis_maps/gis_map&amp;map_id='.$map['id_tgis_map'].'&amp;action=delete_map" onclick="return confirmDelete();">'.html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
$data['op'] = '<a href="index.php?sec=godgismaps&amp;sec2=godmode/gis_maps/configure_gis_map&map_id='.$map['id_tgis_map'].'&amp;action=edit_map">'.html_print_image('images/edit.svg', true, ['title' => __('Edit')]).'</a>'.'<a href="index.php?sec=godgismaps&amp;sec2=operation/gis_maps/gis_map&amp;map_id='.$map['id_tgis_map'].'&amp;action=delete_map" onclick="return confirmDelete();">'.html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
}
array_push($table->data, $data);

2
pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
View File

@ -195,7 +195,7 @@ foreach ($files as $key => $value) {
$table_files->data[$i][4] = $value[13];
$table_files->data[$i][5] .= '<a id="link_delete_file" href="'.ui_get_full_url('index.php?sec=incident&sec2=operation/incidents/dashboard_detail_integriaims_incident&incident_id='.$incident_id.'&delete_file='.$value[0]).'"
onClick="javascript:if (!confirm(\''.__('Are you sure?').'\')) return false;">';
$table_files->data[$i][5] .= html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']);
$table_files->data[$i][5] .= html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']);
$table_files->data[$i][5] .= '</a>';

4
pandora_console/operation/incidents/list_integriaims_incidents.php
View File

@ -547,12 +547,12 @@ foreach ($incidents_paginated as $key => $value) {
$table->data[$i][8] = '';
$table->cellclass[$i][8] = 'table_action_buttons';
$table->data[$i][8] .= '<a href="'.ui_get_full_url('index.php?sec=incident&sec2=operation/incidents/configure_integriaims_incident&incident_id='.$array_get_incidents[$key][0]).'">';
$table->data[$i][8] .= html_print_image('images/config.png', true, ['title' => __('Edit')]);
$table->data[$i][8] .= html_print_image('images/edit.svg', true, ['title' => __('Edit')]);
$table->data[$i][8] .= '</a>';
$table->data[$i][8] .= '<a id="link_delete_incident" href="'.ui_get_full_url('index.php?sec=incident&sec2=operation/incidents/list_integriaims_incidents&delete_incident='.$array_get_incidents[$key][0]).'"
onClick="javascript:if (!confirm(\''.__('Are you sure?').'\')) return false;">';
$table->data[$i][8] .= html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']);
$table->data[$i][8] .= html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']);
$table->data[$i][8] .= '</a>';
$i++;

24
pandora_console/operation/search_agents.php
View File

@ -34,7 +34,7 @@ if (!$agents || !$searchAgents) {
$table->cellpadding = 4;
$table->cellspacing = 4;
$table->width = '98%';
$table->class = 'databox';
$table->class = 'info_table';
$table->head = [];
@ -154,15 +154,29 @@ if (!$agents || !$searchAgents) {
}
echo '<br />';
if (!$only_count) {
ui_pagination($totalAgents);
}
html_print_table($table);
unset($table);
if (!$only_count) {
ui_pagination($totalAgents);
$tablePagination = ui_pagination(
$totalAgents,
false,
0,
0,
true,
'offset',
false
);
}
html_print_action_buttons(
'',
[
'type' => 'data_table',
'class' => 'fixed_action_buttons',
'right_content' => $tablePagination,
]
);
}
if ($only_count) {

24
pandora_console/operation/search_modules.php
View File

@ -26,7 +26,7 @@ if (!$modules || !$searchModules) {
$table->cellpadding = 4;
$table->cellspacing = 4;
$table->width = '98%';
$table->class = 'databox';
$table->class = 'info_table';
$table->head = [];
$table->head[0] = __('Module').' <a href="index.php?search_category=modules&keywords='.$config['search_keywords'].'&head_search_keywords=abc&offset='.$offset.'&sort_field=module_name&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectModuleNameUp]).'</a><a href="index.php?search_category=modules&keywords='.$config['search_keywords'].'&head_search_keywords=abc&offset='.$offset.'&sort_field=module_name&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectModuleNameDown]).'</a>';
@ -209,7 +209,7 @@ if (!$modules || !$searchModules) {
$url_edit = 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$module['id_agente'].'&tab=module&id_agent_module='.$module['id_agente_modulo'].'&edit_module=1';
$edit_module = '<a href="'.$url_edit.'">'.html_print_image('images/config.png', true).'</a>';
$edit_module = '<a href="'.$url_edit.'">'.html_print_image('images/edit.svg', true).'</a>';
} else {
$edit_module = '';
}
@ -232,8 +232,24 @@ if (!$modules || !$searchModules) {
}
echo '<br />';
ui_pagination($totalModules);
html_print_table($table);
unset($table);
ui_pagination($totalModules);
$tablePagination = ui_pagination(
$totalModules,
false,
0,
0,
true,
'offset',
false
);
html_print_action_buttons(
'',
[
'type' => 'data_table',
'class' => 'fixed_action_buttons',
'right_content' => $tablePagination,
]
);
}

10
pandora_console/operation/search_results.php
View File

@ -189,13 +189,19 @@ $onheader = [
'policies' => $policies_tab,
];
ui_print_page_header(
ui_print_standard_header(
__('Search').': "'.$config['search_keywords'].'"',
'images/zoom_mc.png',
false,
'',
false,
$onheader
$onheader,
[
[
'link' => '',
'label' => __('Search'),
],
]
);
$only_count = false;

4
pandora_console/views/calendar/special_days.php
View File

@ -449,7 +449,7 @@ for ($month = 1; $month <= 12; $month++) {
$cal_table->data[$cal_line][$week] .= '<a href="'.$url.'&op=edit&id='.$special_day['id'].'" title=';
$cal_table->data[$cal_line][$week] .= __('Edit');
$cal_table->data[$cal_line][$week] .= '>'.html_print_image(
'images/config.png',
'images/edit.svg',
true,
['class' => 'invert_filter']
).'</a> &nbsp;';
@ -461,7 +461,7 @@ for ($month = 1; $month <= 12; $month++) {
$cal_table->data[$cal_line][$week] .= __('Remove');
$cal_table->data[$cal_line][$week] .= '">';
$cal_table->data[$cal_line][$week] .= html_print_image(
'images/cross.png',
'images/delete.svg',
true,
['class' => 'invert_filter']
).'</a>';