tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-04-08 18:55:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into ent-10633-pantalla-de-timeout

Browse Source
This commit is contained in:
Daniel Cebrian 2023-03-30 09:30:38 +02:00
commit f442272177
50 changed files with 3198 additions and 745 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 7.0NG.770-230329
Version: 7.0NG.770-230330
Architecture: all
Priority: optional
Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.770-230329"
pandora_version="7.0NG.770-230330"
echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

@ -1023,7 +1023,7 @@ my $Sem = undef;
my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.770';
use constant AGENT_BUILD => '230329';
use constant AGENT_BUILD => '230330';
# Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000;

2
pandora_agents/unix/pandora_agent.redhat.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil}
%define name pandorafms_agent_linux
%define version 7.0NG.770
%define release 230329
%define release 230330
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil}
%define name pandorafms_agent_linux
%define version 7.0NG.770
%define release 230329
%define release 230330
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# **********************************************************************
PI_VERSION="7.0NG.770"
PI_BUILD="230329"
PI_BUILD="230330"
OS_NAME=`uname -s`
FORCE=0

2
pandora_agents/win32/installer/pandora.mpi
View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{230329}
{230330}
ViewReadme
{Yes}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("7.0NG.770 Build 230329")
#define PANDORA_VERSION ("7.0NG.770 Build 230330")
string pandora_path;
string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.770(Build 230329))"
VALUE "ProductVersion", "(7.0NG.770(Build 230330))"
VALUE "FileVersion", "1.0.0.0"
END
END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 7.0NG.770-230329
Version: 7.0NG.770-230330
Architecture: all
Priority: optional
Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.770-230329"
pandora_version="7.0NG.770-230330"
package_pear=0
package_pandora=1

35
pandora_console/extensions/agents_modules.php
View File

@ -729,16 +729,31 @@ function mainAgentsModules()
if (isset($modules_selected[0]) === true && $modules_selected[0]) {
$all_modules = [];
foreach ($modules_selected as $key => $value) {
$name = modules_get_agentmodule_name($value);
$sql = "SELECT id_agente_modulo
FROM tagente_modulo
WHERE nombre = '".$name."';";
if (is_int($value)) {
$name = modules_get_agentmodule_name($value);
$sql = "SELECT id_agente_modulo
FROM tagente_modulo
WHERE nombre = '".$name."';";
$result_sql = db_get_all_rows_sql($sql);
$result_sql = db_get_all_rows_sql($sql);
if (is_array($result_sql)) {
foreach ($result_sql as $key => $value) {
$all_modules[$value['id_agente_modulo']] = io_safe_output($name);
if (is_array($result_sql)) {
foreach ($result_sql as $key => $value) {
$all_modules[$value['id_agente_modulo']] = io_safe_output($name);
}
}
} else {
$name = $value;
$sql = "SELECT id_agente_modulo
FROM tagente_modulo
WHERE nombre = '".$name."';";
$result_sql = db_get_all_rows_sql($sql);
if (is_array($result_sql)) {
foreach ($result_sql as $key => $value) {
$all_modules[$value['id_agente_modulo']] = io_safe_output($name);
}
}
}
}
@ -838,7 +853,7 @@ function mainAgentsModules()
echo '<tr>';
echo "<th width='140px' class='pdd_r_10px align_right'>".__('Agents').' / '.__('Modules').'</th>';
echo "<th width='40px' class='pdd_r_10px align_left'>".__('Agents').' / '.__('Modules').'</th>';
if ($hor_offset > 0) {
$new_hor_offset = ($hor_offset - $block);
@ -958,7 +973,7 @@ function mainAgentsModules()
foreach ($module['id'] as $module_id) {
if (!$match && array_key_exists($module_id, $agent_modules)) {
echo "<td class='center'>";
echo "<td class='center' style='text-align:left;'>";
$win_handle = dechex(crc32($module_id.$module['name']));
$graph_type = return_graphtype(modules_get_agentmodule_type($module_id));
$link = "winopeng_var('".'operation/agentes/stat_win.php?'."type=$graph_type&".'period='.SECONDS_1DAY.'&'.'id='.$module_id.'&'.'refresh='.SECONDS_10MINUTES."', 'day_".$win_handle."', 800, 480)";

10
pandora_console/general/noaccess.php
View File

@ -15,7 +15,7 @@
<style>
#alert_messages_na {
z-index: 2;
position: absolute;
position: fixed;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
@ -160,9 +160,9 @@
?>
</div>
<div class='modalokbutto cerrar'>
<span class='modalokbuttontex'>OK</span>
</div>
<button type="submit" class="cerrar submitButton" name="" id="" value="OK">
<span id="" style="" class="font_11">OK</span>
</button>
</div>
</div>
<div id="opacidad"></div>
@ -173,6 +173,4 @@
$(".cerrar").click(function() {
window.location = "<?php echo $config['homeurl']; ?>";
});
$('div#page').css('background-color', '#d3d3d3');
</script>

49
pandora_console/godmode/users/user_management.php
View File

@ -736,22 +736,18 @@ $userManagementTable->data['fields_addSettings'][1] .= html_print_div(
true
);
$contentQrCode = [];
$contentQrCode[] = html_print_image(
'images/example_qr.png',
true,
[
'width' => '200px',
'height' => '200px',
]
$CodeQRContent .= html_print_div(['id' => 'qr_container_image', 'class' => 'scale-0-8'], true);
$CodeQRContent .= html_print_anchor(
['id' => 'qr_code_agent_view'],
true
);
$contentQrCode[] = '<span class="input_sub_placeholder input_sub_placeholder_qrcode">'.__('Generated automatically with the information provided for the user').'</span>';
$CodeQRContent .= '<br/>'.$custom_id_div;
$qrCode = html_print_div(
// QR code div.
$CodeQRTable = html_print_div(
[
'style' => 'display: flex;flex-direction: column;align-items: center;',
'content' => implode('', $contentQrCode),
'class' => 'agent_qr',
'content' => $CodeQRContent,
],
true
);
@ -760,8 +756,33 @@ $qrCode = html_print_div(
html_print_div(
[
'id' => 'api_qrcode_display',
'content' => $qrCode.$apiTokenContent,
'content' => $CodeQRTable.$apiTokenContent,
]
);
html_print_table($userManagementTable);
$vcard_data = [];
$vcard_data['version'] = '3.0';
$vcard_data['firstName'] = $user_info['firstname'];
$vcard_data['lastName'] = $user_info['lastname'];
$vcard_data['middleName'] = ($user_info['middlename'] === '1') ? '' : $user_info['middlename'];
$vcard_data['nickname'] = $user_info['fullname'];
$vcard_data['workPhone'] = $user_info['phone'];
$vcard_data['email'] = $user_info['email'];
$vcard_data['organization'] = io_safe_output(get_product_name());
$vcard_data['url'] = ui_get_full_url('index.php');
$vcard_json = json_encode($vcard_data);
?>
<script type="text/javascript">
$(document).ready(function () {
paint_vcard(
<?php echo $vcard_json; ?>,
"#qr_code_agent_view",
128,
128
);
});
</script>

32
pandora_console/images/force@svg.svg Normal file
View File

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
<style type="text/css">
.st0{fill:#3F3F3F;}
</style>
<g>
<path class="st0" d="M10.6,0.1c0.4,0.1,0.8,0.1,1.3,0.2c1.5,0.3,2.8,0.9,4,1.8c0.1,0,0.1,0.1,0.2,0.1C16,2.1,16,2,16,2
c-0.1-0.3,0.1-0.6,0.4-0.7c0.3-0.1,0.6,0.1,0.7,0.4c0.2,0.5,0.4,1.1,0.5,1.6c0.1,0.3,0.2,0.5,0.3,0.8c0.1,0.2,0,0.4-0.1,0.6
c-0.2,0.2-0.4,0.2-0.6,0.1c-0.8-0.3-1.6-0.5-2.3-0.8c-0.3-0.1-0.5-0.3-0.5-0.6c0-0.3,0.2-0.5,0.6-0.5c0,0,0,0,0.1,0
c0,0-0.1,0-0.1-0.1c-1.6-1-3.4-1.6-5.3-1.5c-3.8,0.2-7,2.8-8,6.4C1.1,9.5,1.2,11.2,1.8,13c0,0.1,0.1,0.2,0.1,0.3
c0.1,0.3,0,0.7-0.3,0.8c-0.3,0.1-0.6,0-0.8-0.4c-0.3-0.7-0.5-1.5-0.6-2.3c0-0.3-0.1-0.5-0.1-0.8c0-0.4,0-0.8,0-1.2
c0-0.1,0-0.1,0-0.2c0.1-0.5,0.1-1,0.2-1.5c0.9-3.8,4.1-6.8,7.9-7.4C8.7,0.2,9,0.2,9.4,0.1C9.8,0.1,10.2,0.1,10.6,0.1z"/>
<path class="st0" d="M10,16.4c-0.4,0-0.7,0-1.1,0c-0.4,0-0.6-0.2-0.6-0.6c0-0.2,0-0.5,0-0.7c0-0.1-0.1-0.2-0.1-0.2
c-0.5-0.2-1-0.5-1.4-0.8c0,0-0.1,0-0.2,0c-0.2,0.1-0.4,0.2-0.6,0.4c-0.3,0.2-0.6,0.1-0.8-0.2c-0.4-0.6-0.7-1.3-1.1-1.9
c-0.2-0.3-0.1-0.7,0.2-0.9c0.2-0.1,0.4-0.2,0.6-0.4c0,0,0.1-0.1,0.1-0.2c-0.1-0.6-0.1-1.1,0-1.7c0-0.1,0-0.2-0.1-0.2
C4.6,8.8,4.3,8.7,4.1,8.6C3.8,8.4,3.7,8.1,3.9,7.8c0.4-0.7,0.8-1.3,1.2-2c0.2-0.3,0.5-0.4,0.8-0.2C6.1,5.7,6.3,5.9,6.5,6
c0.1,0,0.2,0,0.2,0c0.4-0.3,0.9-0.6,1.4-0.8c0.1,0,0.1-0.1,0.1-0.2c0-0.2,0-0.5,0-0.7c0-0.4,0.2-0.6,0.6-0.6c0.8,0,1.5,0,2.3,0
c0.4,0,0.6,0.2,0.6,0.6c0,0.2,0,0.5,0,0.7c0,0.1,0,0.2,0.1,0.2c0.5,0.2,1,0.5,1.4,0.8c0,0,0.2,0,0.2,0c0.2-0.1,0.4-0.2,0.6-0.3
c0.3-0.2,0.7-0.1,0.9,0.2c0.4,0.6,0.7,1.3,1.1,1.9c0.2,0.4,0.1,0.7-0.2,0.9c-0.2,0.1-0.4,0.2-0.6,0.3c-0.1,0.1-0.1,0.1-0.1,0.2
c0.1,0.5,0.1,1.1,0,1.6c0,0.1,0,0.2,0.1,0.2c0.2,0.1,0.4,0.2,0.6,0.3c0.3,0.2,0.4,0.5,0.2,0.8c-0.4,0.7-0.7,1.3-1.1,1.9
c-0.2,0.3-0.5,0.4-0.8,0.2c-0.2-0.1-0.4-0.2-0.6-0.4c-0.1,0-0.2,0-0.2,0c-0.4,0.3-0.9,0.6-1.4,0.8c-0.1,0-0.1,0.1-0.1,0.2
c0,0.2,0,0.5,0,0.7c0,0.4-0.2,0.6-0.6,0.6C10.7,16.4,10.4,16.4,10,16.4z M11.7,10c0-1-0.8-1.7-1.7-1.7C9,8.3,8.3,9,8.3,10
c0,1,0.8,1.7,1.7,1.7C11,11.7,11.7,10.9,11.7,10z"/>
<path class="st0" d="M4,17.8c0,0.1,0,0.1,0,0.2c0.1,0.3-0.1,0.6-0.4,0.7S3,18.7,2.9,18.3c-0.1-0.2-0.1-0.4-0.2-0.6
c-0.2-0.6-0.4-1.2-0.6-1.7C2,15.7,2,15.5,2.2,15.3c0.2-0.2,0.4-0.2,0.7-0.1c0.8,0.3,1.5,0.5,2.3,0.8c0.3,0.1,0.5,0.3,0.5,0.6
c0,0.3-0.2,0.5-0.6,0.5c0,0,0,0-0.1,0c0.5,0.3,1,0.5,1.5,0.8c1.2,0.6,2.5,0.8,3.8,0.8c3.2-0.2,5.6-1.6,7.2-4.3
c0.9-1.4,1.3-3,1.2-4.7c0-1-0.3-2-0.6-2.9c-0.1-0.4,0-0.7,0.3-0.8c0.3-0.1,0.6,0,0.8,0.3c0.3,0.8,0.6,1.6,0.7,2.5
c0.6,4.3-1.9,8.4-5.7,10.2c-3.3,1.5-6.5,1.1-9.6-0.8C4.3,18.1,4.1,17.9,4,17.8z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

22
pandora_console/images/gm_log@svg.svg Normal file
View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
<style type="text/css">
.st0{fill:#3F3F3F;}
</style>
<g>
<g>
<path class="st0" d="M3.6,10.8c0.1-0.2,0.3-0.4,0.4-0.6c0.8-1,1.7-1.8,2.9-2.4c0.8-0.4,1.6-0.6,2.5-0.7c1.7-0.2,3.2,0.3,4.6,1.2
c0.9,0.6,1.7,1.4,2.3,2.2c0.2,0.2,0.2,0.4,0,0.7c-0.8,1-1.6,1.8-2.7,2.5c-0.9,0.5-1.9,0.9-2.9,1c-1.5,0.1-2.9-0.2-4.2-1
c-1.1-0.6-1.9-1.5-2.7-2.5c0-0.1-0.1-0.1-0.1-0.2C3.6,10.9,3.6,10.8,3.6,10.8z M9.9,8.2c-1.5,0-2.6,1.3-2.6,2.8
c0,1.5,1.3,2.6,2.8,2.6c1.4,0,2.6-1.3,2.6-2.8C12.7,9.3,11.4,8.2,9.9,8.2z"/>
<path class="st0" d="M10,9.4c0.8,0,1.4,0.6,1.4,1.4c0,0.8-0.6,1.5-1.5,1.5c-0.8,0-1.4-0.6-1.4-1.4C8.6,10.1,9.2,9.4,10,9.4z"/>
</g>
<path class="st0" d="M2.9,0c3.8,0,7.6,0,11.4,0c0.1,0.1,0.3,0.2,0.4,0.3c1.4,1.3,2.7,2.7,4,4C18.9,4.5,19,4.7,19,4.9c0,5,0,8,0,13
c0,1.2-0.9,2.1-2.1,2.1c-4.6,0-9.1,0-13.7,0c-0.5,0-0.9-0.1-1.3-0.4C1.3,19.1,1,18.5,1,17.8c0-5,0-7.9,0-12.9C1,4,1,3.1,1,2.2
c0-0.7,0.3-1.3,0.8-1.8C2.2,0.2,2.5,0.1,2.9,0z M13.5,1.4c-0.1,0-0.2,0-0.2,0c-3.3,0-6.6,0-10,0c-0.6,0-0.8,0.3-0.8,0.8
c0,5.9,0,9.7,0,15.5c0,0.6,0.2,0.8,0.8,0.8c4.5,0,9,0,13.5,0c0.6,0,0.8-0.3,0.8-0.8c0-4.7,0-7.3,0-12c0-0.1,0-0.2,0-0.2
c-0.9,0-1.8,0-2.7,0c-0.9,0-1.4-0.6-1.5-1.4c0-0.4,0-0.9,0-1.3C13.5,2.3,13.5,1.9,13.5,1.4z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

47
pandora_console/images/linux@os.svg
View File

@ -1,9 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
<title>Dark / 20 / linux@svg</title>
<desc>Created with Sketch.</desc>
<g id="Dark-/-20-/-linux" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M6.05224,3.20953333 C6.4286,1.34333333 8.08088,0 9.99994667,0 C11.9190133,0 13.5713333,1.34333333 13.9476,3.20953333 L14.3973333,5.43925333 C14.6324,6.6052 15.0956,7.71416 15.7606667,8.70350667 L16.5345333,9.85470667 C17.0174667,10.57304 17.3332,11.3846667 17.4638667,12.2309733 C18.2329333,12.29556 18.9070667,12.78468 19.1973333,13.5044 L19.8529333,15.1298667 C20.1834667,15.9493333 19.9444,16.8866667 19.2606667,17.4516 L16.7485333,19.5277333 C16.0170667,20.1322667 14.9625333,20.1590667 14.2008,19.5925333 L13.1892267,18.8401333 C13.1758533,18.8302667 13.1626267,18.8201333 13.1495467,18.8098667 C12.6529733,18.9433333 12.1305733,19.0146667 11.5914,19.0146667 L8.40849333,19.0146667 C7.86934667,19.0146667 7.34697333,18.9434667 6.85042667,18.8098667 C6.83736,18.8201333 6.82414667,18.8302667 6.81077333,18.8401333 L5.79922667,19.5925333 C5.03748,20.1590667 3.983,20.1322667 3.25150667,19.5277333 L0.73928,17.4516 C0.0556233333,16.8866667 -0.183466667,15.9493333 0.147041333,15.1298667 L0.8027,13.5044 C1.09295333,12.78472 1.76702667,12.2956 2.53597333,12.2309867 C2.66666667,11.3846667 2.9824,10.57304 3.46529333,9.85470667 L4.23917333,8.70350667 C4.90424,7.71416 5.36742667,6.6052 5.60257333,5.43925333 L6.05224,3.20953333 Z M14.4593333,12.6344667 C14.1793333,12.8439067 13.9522667,13.1250933 13.8081333,13.4584 L12.7839867,15.8284 C12.2670133,16.1305333 11.6694533,16.2982667 11.0462,16.2982667 L8.95373333,16.2982667 C8.33052,16.2982667 7.733,16.1305333 7.21604,15.8285333 L6.19181333,13.4584 C6.04774667,13.1250667 5.82069333,12.8438667 5.54061333,12.6344267 C5.57494667,12.2047333 5.69186667,11.78004 5.89137333,11.3843467 L7.56904,8.05678667 L7.57910667,8.06676 C8.9162,9.39277333 11.0840533,9.39277333 12.4211333,8.06676 L12.4309867,8.05698667 L14.1085333,11.3843333 C14.3081333,11.7800533 14.4249333,12.20476 14.4593333,12.6344667 Z M12.05424,5.69208 L12.05424,4.07456 L10.6847067,4.07456 L10.6847067,5.14284 C10.9753467,5.20164 11.26008,5.29828 11.5313067,5.43277333 L12.05424,5.69208 Z M9.31517333,5.14290667 L9.31517333,4.07456 L7.94564,4.07456 L7.94564,5.69225333 L8.46893333,5.43277333 C8.74005333,5.29833333 9.02466667,5.20172 9.31517333,5.14290667 Z M2.71006667,13.5818667 C2.43006667,13.5818667 2.17826667,13.7509333 2.07428,14.0088 L1.41862667,15.6342667 C1.308452,15.9074667 1.38814667,16.2198667 1.61604,16.4082667 L4.12826667,18.4844 C4.37209333,18.6858667 4.72358667,18.6948 4.97750667,18.506 L5.98905333,17.7536 C6.24173333,17.5657333 6.33201333,17.2306667 6.2076,16.9428 L4.93301333,13.9934667 C4.82512,13.7437333 4.57754667,13.5818667 4.30361333,13.5818667 L2.71006667,13.5818667 Z M17.9257333,14.0088 C17.8217333,13.7509333 17.57,13.5818667 17.2898667,13.5818667 L15.6964,13.5818667 C15.4224,13.5818667 15.1749333,13.7437333 15.0669333,13.9934667 L13.7924,16.9428 C13.668,17.2306667 13.7582667,17.5657333 14.0109333,17.7536 L15.0225333,18.506 C15.2764,18.6948 15.6278667,18.6858667 15.8717333,18.4844 L18.384,16.4082667 C18.6118667,16.2198667 18.6916,15.9074667 18.5813333,15.6342667 L17.9257333,14.0088 Z M9.08141333,6.64757333 C9.65974667,6.3608 10.3404933,6.3608 10.9188267,6.64757333 L11.5831867,6.977 L11.4527333,7.10637333 C10.65048,7.90198667 9.34976,7.90198667 8.54750667,7.10637333 L8.41705333,6.977 L9.08141333,6.64757333 Z" id="Shape" fill="#3F3F3F"></path>
</g>
</svg>
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
<style type="text/css">
.st0{fill:#3F3F3F;}
</style>
<title>Dark / 20 / incremental-data@svg</title>
<desc>Created with Sketch.</desc>
<path class="st0" d="M10.5,0.1c0.3,0.1,0.6,0.1,0.8,0.2c0.9,0.4,1.4,1.1,1.6,1.9c0.2,0.6,0.3,1.3,0.3,2c0,0.4,0,0.8,0.1,1.3
c0,0.6,0.3,1,0.6,1.5c0.7,1.1,1.5,2.2,2.1,3.3c0.2,0.4,0.4,0.8,0.6,1.3c0.2,0.7,0.2,1.5,0,2.2c0,0.1,0,0.2,0.1,0.3
c0.2,0.3,0.4,0.6,0.3,0.9c0,0.6,0.3,0.9,0.7,1.1c0,0,0.1,0,0.1,0.1c0.6,0.3,0.7,0.9,0.1,1.3c-0.1,0.1-0.3,0.2-0.4,0.3
c-0.8,0.5-1.5,0.9-2.3,1.4c-0.2,0.1-0.3,0.3-0.5,0.4c-0.5,0.4-1,0.4-1.5,0.3c-0.3-0.1-0.5-0.4-0.7-0.6c0-0.1-0.1-0.1-0.2-0.2
c-1.4-0.3-2.8-0.2-4.3,0c-0.1,0-0.1,0.1-0.2,0.1c-0.3,0.5-0.7,0.6-1.2,0.6c-0.3,0-0.5-0.1-0.8-0.2c-1.1-0.4-2.3-0.8-3.4-0.9
c-0.2,0-0.4-0.1-0.6-0.2c-0.3-0.1-0.4-0.4-0.3-0.7c0-0.1,0.1-0.2,0.1-0.3C1.9,17,1.9,16.5,1.8,16c-0.2-0.6,0-0.8,0.6-1
c0.3-0.1,0.6-0.2,0.8-0.3c0.3-0.1,0.5-0.3,0.6-0.6c0.1-0.2,0.3-0.3,0.4-0.5c0,0,0.1-0.1,0-0.2c-0.1-0.4,0-0.8,0.2-1.3
c0.3-0.7,0.5-1.3,0.8-2c0.2-0.7,0.6-1.3,1.1-1.9C6.5,8,6.7,7.7,7,7.4C7.3,7,7.4,6.6,7.4,6.1c0-0.7-0.1-1.4-0.1-2.1
c0-0.6,0-1.1,0-1.7c0.1-1.1,0.7-1.7,1.7-2c0.3-0.1,0.5-0.1,0.8-0.2C10.1,0.1,10.3,0.1,10.5,0.1z M7.4,16.8c0.2,0.3,0.5,0.6,0.7,0.8
c0.1,0.1,0.2,0.1,0.2,0.1c0.5,0,1,0,1.5,0c1.2,0,2.1-0.6,2.9-1.5c0.1-0.1,0.1-0.2,0.1-0.3c0-0.6,0.1-1.2,0.1-1.7
c0-0.2,0.1-0.3,0.3-0.4c0.1,0,0.3,0,0.5,0c0.2-1,0.3-2-0.1-2.9c-0.4-1.2-0.9-2.3-1.4-3.4c-0.2-0.4-0.4-0.9-0.6-1.3
c-0.1-0.1-0.2-0.2-0.3-0.1c-0.3,0.1-0.6,0.3-0.8,0.4c-0.4,0.2-0.8,0.4-1.2,0.6c-0.2,0.1-0.4,0.1-0.5,0C8.8,7,8.6,7,8.5,6.9
C8.2,6.7,8,6.5,7.8,6.3c0,0.7-0.2,1.4-0.6,1.9C7,8.4,6.9,8.7,6.8,8.9c-0.2,0.6-0.4,1.2-0.7,1.8c-0.3,0.6-0.5,1.1-0.5,1.7
c-0.1,0.7,0,1.3,0.6,1.8c0.1,0.1,0.2,0.2,0.3,0.2c0.4,0.3,0.8,0.6,1.2,1c0.2,0.1,0.3,0.3,0.4,0.5C8.1,16.3,7.9,16.6,7.4,16.8z
M2.2,17.6c0,0.3,0,0.3,0.2,0.4c0.1,0,0.3,0.1,0.4,0.1c0.8,0.1,1.7,0.3,2.4,0.6c0.4,0.2,0.9,0.3,1.3,0.4c0.1,0,0.3,0,0.4,0
c0.5-0.4,0.8-0.8,0.4-1.5c-0.2-0.4-0.5-0.7-0.8-1c-0.3-0.5-0.6-1.1-1-1.6c-0.2-0.3-0.5-0.6-0.8-0.8c-0.2-0.2-0.4-0.1-0.5,0.1
c-0.1,0.2-0.2,0.3-0.3,0.5c-0.1,0.2-0.3,0.4-0.5,0.4c-0.3,0.1-0.5,0.1-0.8,0.2c-0.4,0.1-0.4,0.2-0.4,0.6c0,0,0,0,0,0.1
c0.1,0.4,0.1,0.8-0.1,1.2C2.3,17.4,2.3,17.6,2.2,17.6z M13.9,14.5c-0.2-0.1-0.4,0-0.4,0.2c0,0.4,0.1,0.7,0,1.1
c-0.1,0.7-0.2,1.3-0.3,2c-0.1,0.4-0.1,0.7,0.1,1.1c0.2,0.3,0.5,0.5,0.9,0.3c0.3-0.1,0.5-0.3,0.7-0.5c0.4-0.4,0.8-0.7,1.3-0.9
c0.3-0.2,0.6-0.3,0.9-0.5c0.1-0.1,0.3-0.2,0.4-0.3c0.1-0.1,0.2-0.2,0-0.4c-0.1-0.1-0.3-0.2-0.4-0.3c-0.3-0.2-0.6-0.4-0.6-0.8
c0-0.2,0-0.3-0.1-0.5c0-0.2-0.1-0.3-0.2-0.4c0,0-0.1,0.1-0.1,0.1c-0.2,0.5-0.7,0.8-1.2,0.9c-0.7,0.1-1.1-0.2-1.2-0.9
C13.9,14.7,13.9,14.6,13.9,14.5z M9.3,6.7c0.1,0,0.2-0.1,0.3-0.1c0.4-0.2,0.9-0.5,1.3-0.7c0.1-0.1,0.2-0.2,0.2-0.3
c0-0.1-0.2-0.2-0.2-0.3c0,0,0,0-0.1,0c-0.4-0.2-0.9-0.3-1.3-0.5c-0.2-0.1-0.3-0.1-0.5,0c-0.4,0.3-0.7,0.5-1,0.8c0,0-0.1,0.2,0,0.3
c0.3,0.4,0.6,0.6,1,0.8C9.2,6.7,9.2,6.7,9.3,6.7z M10.3,4.5c0-0.2,0-0.4,0.1-0.6c0.1-0.2,0.3-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4
c0.1,0.3,0.1,0.7-0.2,0.9c0.2,0.1,0.2,0.1,0.4,0c0.4-0.4,0.5-1.2,0.1-1.7c-0.4-0.5-1-0.5-1.4,0C9.9,3.4,9.8,3.7,9.9,4
C9.9,4.4,10,4.4,10.3,4.5z M8.7,4.5C8.8,4.4,8.9,4.4,9,4.3c0,0,0.1-0.1,0.1-0.1c0.1-0.4,0-0.8-0.3-1.1c-0.3-0.3-0.7-0.3-1,0
c-0.3,0.4-0.4,1.2,0,1.6c0.2,0.3,0.3,0.3,0.5,0C8,4.7,7.8,4.3,7.9,3.9C8,3.7,8,3.6,8.2,3.6c0.1,0,0.3,0.1,0.3,0.2
C8.7,4,8.7,4.2,8.7,4.5z"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

47
pandora_console/images/networkmap/linux@os.svg
View File

@ -1,9 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
<title>Dark / 20 / linux@svg</title>
<desc>Created with Sketch.</desc>
<g id="Dark-/-20-/-linux" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M6.05224,3.20953333 C6.4286,1.34333333 8.08088,0 9.99994667,0 C11.9190133,0 13.5713333,1.34333333 13.9476,3.20953333 L14.3973333,5.43925333 C14.6324,6.6052 15.0956,7.71416 15.7606667,8.70350667 L16.5345333,9.85470667 C17.0174667,10.57304 17.3332,11.3846667 17.4638667,12.2309733 C18.2329333,12.29556 18.9070667,12.78468 19.1973333,13.5044 L19.8529333,15.1298667 C20.1834667,15.9493333 19.9444,16.8866667 19.2606667,17.4516 L16.7485333,19.5277333 C16.0170667,20.1322667 14.9625333,20.1590667 14.2008,19.5925333 L13.1892267,18.8401333 C13.1758533,18.8302667 13.1626267,18.8201333 13.1495467,18.8098667 C12.6529733,18.9433333 12.1305733,19.0146667 11.5914,19.0146667 L8.40849333,19.0146667 C7.86934667,19.0146667 7.34697333,18.9434667 6.85042667,18.8098667 C6.83736,18.8201333 6.82414667,18.8302667 6.81077333,18.8401333 L5.79922667,19.5925333 C5.03748,20.1590667 3.983,20.1322667 3.25150667,19.5277333 L0.73928,17.4516 C0.0556233333,16.8866667 -0.183466667,15.9493333 0.147041333,15.1298667 L0.8027,13.5044 C1.09295333,12.78472 1.76702667,12.2956 2.53597333,12.2309867 C2.66666667,11.3846667 2.9824,10.57304 3.46529333,9.85470667 L4.23917333,8.70350667 C4.90424,7.71416 5.36742667,6.6052 5.60257333,5.43925333 L6.05224,3.20953333 Z M14.4593333,12.6344667 C14.1793333,12.8439067 13.9522667,13.1250933 13.8081333,13.4584 L12.7839867,15.8284 C12.2670133,16.1305333 11.6694533,16.2982667 11.0462,16.2982667 L8.95373333,16.2982667 C8.33052,16.2982667 7.733,16.1305333 7.21604,15.8285333 L6.19181333,13.4584 C6.04774667,13.1250667 5.82069333,12.8438667 5.54061333,12.6344267 C5.57494667,12.2047333 5.69186667,11.78004 5.89137333,11.3843467 L7.56904,8.05678667 L7.57910667,8.06676 C8.9162,9.39277333 11.0840533,9.39277333 12.4211333,8.06676 L12.4309867,8.05698667 L14.1085333,11.3843333 C14.3081333,11.7800533 14.4249333,12.20476 14.4593333,12.6344667 Z M12.05424,5.69208 L12.05424,4.07456 L10.6847067,4.07456 L10.6847067,5.14284 C10.9753467,5.20164 11.26008,5.29828 11.5313067,5.43277333 L12.05424,5.69208 Z M9.31517333,5.14290667 L9.31517333,4.07456 L7.94564,4.07456 L7.94564,5.69225333 L8.46893333,5.43277333 C8.74005333,5.29833333 9.02466667,5.20172 9.31517333,5.14290667 Z M2.71006667,13.5818667 C2.43006667,13.5818667 2.17826667,13.7509333 2.07428,14.0088 L1.41862667,15.6342667 C1.308452,15.9074667 1.38814667,16.2198667 1.61604,16.4082667 L4.12826667,18.4844 C4.37209333,18.6858667 4.72358667,18.6948 4.97750667,18.506 L5.98905333,17.7536 C6.24173333,17.5657333 6.33201333,17.2306667 6.2076,16.9428 L4.93301333,13.9934667 C4.82512,13.7437333 4.57754667,13.5818667 4.30361333,13.5818667 L2.71006667,13.5818667 Z M17.9257333,14.0088 C17.8217333,13.7509333 17.57,13.5818667 17.2898667,13.5818667 L15.6964,13.5818667 C15.4224,13.5818667 15.1749333,13.7437333 15.0669333,13.9934667 L13.7924,16.9428 C13.668,17.2306667 13.7582667,17.5657333 14.0109333,17.7536 L15.0225333,18.506 C15.2764,18.6948 15.6278667,18.6858667 15.8717333,18.4844 L18.384,16.4082667 C18.6118667,16.2198667 18.6916,15.9074667 18.5813333,15.6342667 L17.9257333,14.0088 Z M9.08141333,6.64757333 C9.65974667,6.3608 10.3404933,6.3608 10.9188267,6.64757333 L11.5831867,6.977 L11.4527333,7.10637333 C10.65048,7.90198667 9.34976,7.90198667 8.54750667,7.10637333 L8.41705333,6.977 L9.08141333,6.64757333 Z" id="Shape" fill="#3F3F3F"></path>
</g>
</svg>
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
<style type="text/css">
.st0{fill:#3F3F3F;}
</style>
<title>Dark / 20 / incremental-data@svg</title>
<desc>Created with Sketch.</desc>
<path class="st0" d="M10.5,0.1c0.3,0.1,0.6,0.1,0.8,0.2c0.9,0.4,1.4,1.1,1.6,1.9c0.2,0.6,0.3,1.3,0.3,2c0,0.4,0,0.8,0.1,1.3
c0,0.6,0.3,1,0.6,1.5c0.7,1.1,1.5,2.2,2.1,3.3c0.2,0.4,0.4,0.8,0.6,1.3c0.2,0.7,0.2,1.5,0,2.2c0,0.1,0,0.2,0.1,0.3
c0.2,0.3,0.4,0.6,0.3,0.9c0,0.6,0.3,0.9,0.7,1.1c0,0,0.1,0,0.1,0.1c0.6,0.3,0.7,0.9,0.1,1.3c-0.1,0.1-0.3,0.2-0.4,0.3
c-0.8,0.5-1.5,0.9-2.3,1.4c-0.2,0.1-0.3,0.3-0.5,0.4c-0.5,0.4-1,0.4-1.5,0.3c-0.3-0.1-0.5-0.4-0.7-0.6c0-0.1-0.1-0.1-0.2-0.2
c-1.4-0.3-2.8-0.2-4.3,0c-0.1,0-0.1,0.1-0.2,0.1c-0.3,0.5-0.7,0.6-1.2,0.6c-0.3,0-0.5-0.1-0.8-0.2c-1.1-0.4-2.3-0.8-3.4-0.9
c-0.2,0-0.4-0.1-0.6-0.2c-0.3-0.1-0.4-0.4-0.3-0.7c0-0.1,0.1-0.2,0.1-0.3C1.9,17,1.9,16.5,1.8,16c-0.2-0.6,0-0.8,0.6-1
c0.3-0.1,0.6-0.2,0.8-0.3c0.3-0.1,0.5-0.3,0.6-0.6c0.1-0.2,0.3-0.3,0.4-0.5c0,0,0.1-0.1,0-0.2c-0.1-0.4,0-0.8,0.2-1.3
c0.3-0.7,0.5-1.3,0.8-2c0.2-0.7,0.6-1.3,1.1-1.9C6.5,8,6.7,7.7,7,7.4C7.3,7,7.4,6.6,7.4,6.1c0-0.7-0.1-1.4-0.1-2.1
c0-0.6,0-1.1,0-1.7c0.1-1.1,0.7-1.7,1.7-2c0.3-0.1,0.5-0.1,0.8-0.2C10.1,0.1,10.3,0.1,10.5,0.1z M7.4,16.8c0.2,0.3,0.5,0.6,0.7,0.8
c0.1,0.1,0.2,0.1,0.2,0.1c0.5,0,1,0,1.5,0c1.2,0,2.1-0.6,2.9-1.5c0.1-0.1,0.1-0.2,0.1-0.3c0-0.6,0.1-1.2,0.1-1.7
c0-0.2,0.1-0.3,0.3-0.4c0.1,0,0.3,0,0.5,0c0.2-1,0.3-2-0.1-2.9c-0.4-1.2-0.9-2.3-1.4-3.4c-0.2-0.4-0.4-0.9-0.6-1.3
c-0.1-0.1-0.2-0.2-0.3-0.1c-0.3,0.1-0.6,0.3-0.8,0.4c-0.4,0.2-0.8,0.4-1.2,0.6c-0.2,0.1-0.4,0.1-0.5,0C8.8,7,8.6,7,8.5,6.9
C8.2,6.7,8,6.5,7.8,6.3c0,0.7-0.2,1.4-0.6,1.9C7,8.4,6.9,8.7,6.8,8.9c-0.2,0.6-0.4,1.2-0.7,1.8c-0.3,0.6-0.5,1.1-0.5,1.7
c-0.1,0.7,0,1.3,0.6,1.8c0.1,0.1,0.2,0.2,0.3,0.2c0.4,0.3,0.8,0.6,1.2,1c0.2,0.1,0.3,0.3,0.4,0.5C8.1,16.3,7.9,16.6,7.4,16.8z
M2.2,17.6c0,0.3,0,0.3,0.2,0.4c0.1,0,0.3,0.1,0.4,0.1c0.8,0.1,1.7,0.3,2.4,0.6c0.4,0.2,0.9,0.3,1.3,0.4c0.1,0,0.3,0,0.4,0
c0.5-0.4,0.8-0.8,0.4-1.5c-0.2-0.4-0.5-0.7-0.8-1c-0.3-0.5-0.6-1.1-1-1.6c-0.2-0.3-0.5-0.6-0.8-0.8c-0.2-0.2-0.4-0.1-0.5,0.1
c-0.1,0.2-0.2,0.3-0.3,0.5c-0.1,0.2-0.3,0.4-0.5,0.4c-0.3,0.1-0.5,0.1-0.8,0.2c-0.4,0.1-0.4,0.2-0.4,0.6c0,0,0,0,0,0.1
c0.1,0.4,0.1,0.8-0.1,1.2C2.3,17.4,2.3,17.6,2.2,17.6z M13.9,14.5c-0.2-0.1-0.4,0-0.4,0.2c0,0.4,0.1,0.7,0,1.1
c-0.1,0.7-0.2,1.3-0.3,2c-0.1,0.4-0.1,0.7,0.1,1.1c0.2,0.3,0.5,0.5,0.9,0.3c0.3-0.1,0.5-0.3,0.7-0.5c0.4-0.4,0.8-0.7,1.3-0.9
c0.3-0.2,0.6-0.3,0.9-0.5c0.1-0.1,0.3-0.2,0.4-0.3c0.1-0.1,0.2-0.2,0-0.4c-0.1-0.1-0.3-0.2-0.4-0.3c-0.3-0.2-0.6-0.4-0.6-0.8
c0-0.2,0-0.3-0.1-0.5c0-0.2-0.1-0.3-0.2-0.4c0,0-0.1,0.1-0.1,0.1c-0.2,0.5-0.7,0.8-1.2,0.9c-0.7,0.1-1.1-0.2-1.2-0.9
C13.9,14.7,13.9,14.6,13.9,14.5z M9.3,6.7c0.1,0,0.2-0.1,0.3-0.1c0.4-0.2,0.9-0.5,1.3-0.7c0.1-0.1,0.2-0.2,0.2-0.3
c0-0.1-0.2-0.2-0.2-0.3c0,0,0,0-0.1,0c-0.4-0.2-0.9-0.3-1.3-0.5c-0.2-0.1-0.3-0.1-0.5,0c-0.4,0.3-0.7,0.5-1,0.8c0,0-0.1,0.2,0,0.3
c0.3,0.4,0.6,0.6,1,0.8C9.2,6.7,9.2,6.7,9.3,6.7z M10.3,4.5c0-0.2,0-0.4,0.1-0.6c0.1-0.2,0.3-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4
c0.1,0.3,0.1,0.7-0.2,0.9c0.2,0.1,0.2,0.1,0.4,0c0.4-0.4,0.5-1.2,0.1-1.7c-0.4-0.5-1-0.5-1.4,0C9.9,3.4,9.8,3.7,9.9,4
C9.9,4.4,10,4.4,10.3,4.5z M8.7,4.5C8.8,4.4,8.9,4.4,9,4.3c0,0,0.1-0.1,0.1-0.1c0.1-0.4,0-0.8-0.3-1.1c-0.3-0.3-0.7-0.3-1,0
c-0.3,0.4-0.4,1.2,0,1.6c0.2,0.3,0.3,0.3,0.5,0C8,4.7,7.8,4.3,7.9,3.9C8,3.7,8,3.6,8.2,3.6c0.1,0,0.3,0.1,0.3,0.2
C8.7,4,8.7,4.2,8.7,4.5z"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

8
pandora_console/include/class/CustomNetScan.class.php
View File

@ -523,11 +523,13 @@ class CustomNetScan extends Wizard
// Schedule.
$form['inputs'][] = [
'label' => __('Interval').ui_print_help_tip(
'label' => __('Interval').ui_print_help_tip(
__('Manual interval means that it will be executed only On-demand'),
true
),
'arguments' => [
'class' => 'input-interval',
'extra-container' => true,
'arguments' => [
'type' => 'select',
'selected' => $interv_manual,
'fields' => [
@ -537,7 +539,7 @@ class CustomNetScan extends Wizard
'name' => 'interval_manual_defined',
'return' => true,
],
'extra' => '<span id="interval_manual_container">'.html_print_extended_select_for_time(
'extra' => '<span id="interval_manual_container">'.html_print_extended_select_for_time(
'interval',
$this->task['interval_sweep'],
'',

9
pandora_console/include/class/HTML.class.php
View File

@ -753,9 +753,18 @@ class HTML
) {
$output .= '<li id="'.$input['id'].'" class="'.$class.'">';
$output .= '<label>'.$input['label'].'</label>';
if (isset($input['extra-container']) === true && $input['extra-container'] === true) {
$output .= '<div class="flex extra-container-input">';
}
$output .= self::printInput($input['arguments']);
// Allow dynamic content.
$output .= $input['extra'];
if (isset($input['extra-container']) === true && $input['extra-container'] === true) {
$output .= '</div>';
}
$output .= '</li>';
} else {
$output .= self::printInput($input['arguments']);

2
pandora_console/include/config_process.php
View File

@ -20,7 +20,7 @@
/**
* Pandora build version and version
*/
$build_version = 'PC230329';
$build_version = 'PC230330';
$pandora_version = 'v7.0NG.770';
// Do not overwrite default timezone set if defined.

2
pandora_console/include/functions_filemanager.php
View File

@ -751,7 +751,7 @@ function filemanager_file_explorer(
&& ($readOnly === false)
) {
$data[4] .= '<form method="post" action="'.$url.'" style="">';
$data[4] .= '<input type="image" style="margin-top: 2px;height:21px" class="invert_filter main_menu_icon" src="../../images/delete.svg" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
$data[4] .= '<input type="image" style="margin-top: 2px;height:21px" class="invert_filter main_menu_icon" src="images/delete.svg" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
$data[4] .= html_print_input_hidden('filename', $fileinfo['realpath'], true);
$data[4] .= html_print_input_hidden('hash', md5($fileinfo['realpath'].$config['server_unique_identifier']), true);
$data[4] .= html_print_input_hidden('delete_file', 1, true);

5
pandora_console/include/functions_ui.php
View File

@ -4072,15 +4072,16 @@ function ui_print_datatable(array $parameters)
}";
}
$js .= '});';
$js .= '$("table#'.$table_id.'").removeClass("invisible");
});';
$js .= '
$(function() {
$(document).on("preInit.dt", function (ev, settings) {
// $("table#'.$table_id.'").hide();
$("div.dataTables_length").hide();
$("div.dt-buttons").hide();
});
});
';
$js .= '</script>';

95
pandora_console/include/javascript/pandora.js
View File

@ -1283,14 +1283,95 @@ function paint_qrcode(text, where, width, height) {
$(where).empty();
var qrcode = new QRCode(where, {
text: text,
width: width,
height: height,
colorDark: "#343434",
colorLight: "#ffffff",
correctLevel: QRCode.CorrectLevel.M
var qrcode = qrCode.createQr({
typeElement: "createImg",
data: text,
typeNumber: 5,
cellSize: 5
});
$(where).append(qrcode);
}
function paint_vcard(text, where) {
if (typeof text == "undefined") {
text = window.location.href;
} else {
//null value
if (isEmptyObject(text)) {
text = window.location.href;
}
}
if (typeof where == "undefined") {
where = $("#qrcode_container_image").get(0);
} else if (typeof where == "string") {
where = $(where).get(0);
}
if (typeof where == "undefined") {
where = $("#qrcode_container_image").get(0);
} else if (typeof where == "string") {
where = $(where).get(0);
}
// version: "3.0",
// lastName: "Нижинский",
// middleName: "D",
// firstName: "Костя",
// nameSuffix: "JR",
// namePrefix: "MR",
// nickname: "Test User",
// gender: "M",
// organization: "ACME Corporation",
// workPhone: "312-555-1212444",
// homePhone: "312-555-1313333",
// cellPhone: "312-555-1414111",
// pagerPhone: "312-555-1515222",
// homeFax: "312-555-1616",
// workFax: "312-555-1717",
// birthday: "20140112",
// anniversary: "20140112",
// title: "Crash Test Dummy",
// role: "Crash Testing",
// email: "john.doe@testmail",
// workEmail: "john.doe@workmail",
// url: "http://johndoe",
// workUrl: "http://acemecompany/johndoe",
// homeAddress: {
// label: "Home Address",
// street: "123 Main Street",
// city: "Chicago",
// stateProvince: "IL",
// postalCode: "12345",
// countryRegion: "United States of America"
// },
// workAddress: {
// label: "Work Address",
// street: "123 Corporate Loop\nSuite 500",
// city: "Los Angeles",
// stateProvince: "CA",
// postalCode: "54321",
// countryRegion: "California Republic"
// },
// source: "http://sourceurl",
// note: "dddddd",
// socialUrls: {
// facebook: "johndoe",
// linkedIn: "johndoe",
// twitter: "johndoe",
// flickr: "johndoe",
// skype: "test_skype",
// custom: "johndoe"
// }
$(where).empty();
var qrcode = qrCode.createVCardQr(text, { typeNumber: 30, cellSize: 2 });
$(where).append(qrcode);
}
function show_dialog_qrcode(dialog, text, where, width, height) {

3305
pandora_console/include/javascript/qrcode.js Executable file → Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -655,7 +655,7 @@ var TreeController = {
$content.append(
'<div class="node-icon"><div class="node-icon-container"><img src="' +
(controller.baseURL.length > 0 ? controller.baseURL : "") +
(controller.meta != undefined && controller.meta == 1
(controller.baseURL.indexOf("meta") !== -1
? "../../images/"
: "images/") +
element.icon +
@ -1078,7 +1078,10 @@ var TreeController = {
(controller.baseURL.length > 0
? controller.baseURL
: "") +
'images/module-graph.svg" /> '
(controller.baseURL.indexOf("meta") !== -1
? "../../images/"
: "images/") +
'module-graph.svg" /> '
);
}
@ -1123,7 +1126,10 @@ var TreeController = {
(controller.baseURL.length > 0
? controller.baseURL
: "") +
'images/simple-value.svg" /> '
(controller.baseURL.indexOf("meta") !== -1
? "../../images/"
: "images/") +
'simple-value.svg" /> '
);
$dataImage
.addClass("module-data")

31
pandora_console/include/lib/Dashboard/Widgets/tree_view.php
View File

@ -134,12 +134,7 @@ class TreeViewWidget extends Widget
) {
global $config;
if (is_metaconsole() === true) {
ui_require_css_file('tree_meta');
} else {
ui_require_css_file('tree');
}
ui_require_css_file('tree');
ui_require_css_file('fixed-bottom-box');
// WARNING: Do not edit. This chunk must be in the constructor.
@ -559,11 +554,7 @@ class TreeViewWidget extends Widget
$height = $size['height'];
// Css Files.
if (is_metaconsole() === true) {
\ui_require_css_file('tree_meta', 'include/styles/', true);
} else {
\ui_require_css_file('tree', 'include/styles/', true);
}
\ui_require_css_file('tree', 'include/styles/', true);
if ($config['style'] == 'pandora_black' && !is_metaconsole()) {
\ui_require_css_file('pandora_black', 'include/styles/', true);
@ -576,19 +567,11 @@ class TreeViewWidget extends Widget
'include/javascript/i18n/'
);
if (is_metaconsole() === true) {
\ui_require_javascript_file(
'TreeControllerMeta',
'include/javascript/tree/',
true
);
} else {
\ui_require_javascript_file(
'TreeController',
'include/javascript/tree/',
true
);
}
\ui_require_javascript_file(
'TreeController',
'include/javascript/tree/',
true
);
\ui_require_javascript_file(
'fixed-bottom-box',

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

@ -15,8 +15,8 @@
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* Copyright (c) 2005-2023 Pandora FMS
* Please see https://pandorafms.com for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation for version 2.
@ -934,6 +934,12 @@ select:-internal-list-box {
display: flex;
}
.flex-row-important {
display: flex !important;
flex-direction: row !important;
justify-content: flex-start !important;
}
.padding-2 {
padding: 2em;
}
@ -1642,7 +1648,7 @@ table.info_box.warning {
}
.warning * {
color: #f3b200;
color: #8d4100;
}
.help {
@ -5879,7 +5885,12 @@ div.switch_radio_button label:last-of-type {
cursor: pointer;
}
.switch_radio_button input:checked + label,
.switch_radio_button input:checked + label {
background-color: var(--primary-color);
box-shadow: none;
color: var(--secondary-color) !important;
}
.switch_radio_button input:checked:has(.custom_checkbox) {
background-color: var(--primary-color);
box-shadow: none;
@ -6877,6 +6888,10 @@ div.graph div.legend table {
margin-left: 15px;
}
.mrgn_lft_17px {
margin-left: 17px;
}
.mrgn_lft_20px {
margin-left: 20px;
}
@ -7066,6 +7081,10 @@ div.graph div.legend table {
margin-bottom: 5px;
}
.mrgn_btn_5px_imp {
margin-bottom: 5px !important;
}
.mrgn_btn_10px {
margin-bottom: 10px;
}
@ -10380,6 +10399,12 @@ button.submitButton.link-create-item {
margin: 0 0.5em;
}
.delete_item,
.copy_item {
border-radius: 0;
margin: 0 0.5em;
}
/* End for Visual Consoles */
button.buttonButton.secondary,
button.submitButton.secondary {
@ -11610,10 +11635,8 @@ div[role="dialog"] {
.row-title-font > td > div > div > b {
font-size: 13px;
line-height: 16px;
color: #161628;
text-align: left;
margin-bottom: 10px;
/* font-weight: bold; */
}
.font-title-font {
@ -11816,3 +11839,23 @@ span.help_icon_15px > img {
transform: rotate(360deg);
}
}
li.input-interval .extra-container-input .select2 {
width: 50% !important;
margin-right: 10px;
}
.ui-widget-header {
border: 0px !important;
}
.container-custom-graph {
background-color: white;
height: 700px;
overflow-y: auto;
padding-top: 20px;
}
.scale-0-8 {
transform: scale(0.8);
}

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

@ -625,19 +625,7 @@ div#form_activate_licence #code {
#menu_tab_frame,
#menu_tab_frame_view,
#menu_tab_frame_view_bc {
/*
display: flex;
align-items: flex-end;
justify-content: space-between;
*/
border-bottom: 1px solid #82b92e;
/*
width: 100%;
padding-right: 0px;
margin-bottom: 20px;
height: 53px;
box-sizing: border-box;
*/
background-color: #111 !important;
}
@ -668,7 +656,7 @@ div.nf {
margin-left: 7px;
padding: 8px 1px 6px 25px;
}
/*Font header feedback*/
form#modal_form_feedback {
padding: 10px;
}
@ -1297,10 +1285,12 @@ a.pandora_pagination:hover {
filter: brightness(0) contrast(50%) !important;
}
/*
input:not(div.login_pass > input):not(div.login_nick > input[type="image"]) {
background-color: transparent !important;
color: inherit !important;
}
*/
.databox_color {
background-color: transparent !important;
@ -1535,3 +1525,78 @@ a.autorefresh_txt,
color: #ffffff;
font-size: 8.5pt;
}
.container-custom-graph {
background-color: #222;
}
.header-widget {
background-color: #222;
}
.grid-stack-item-content {
box-shadow: 0px 0px 15px -10px #888;
border-radius: 0px 0px 0px 0px;
}
/* xxx */
.table_section {
padding: 0;
margin-top: 16px;
border: 1px solid #3f3f3f;
height: 100%;
}
.white_box,
.white-box-content {
border: 0px;
background-color: #222 !important;
color: #fff !important;
}
.info_table,
.filter_table {
border: 1px solid #333;
}
.info_table.events > tbody > tr > td {
border-bottom: 1px solid #333;
}
.info_table,
.filter_table {
border: 1px solid #333;
}
a.pandora_pagination,
.filter_summary > div,
.border_bt,
.pagination .page_number {
border: 1px solid #2b2b2b !important;
}
.white_box,
.white-box-content {
border: 1px solid #333;
}
.tree-node div.node-content {
background-color: #000;
}
.node-content {
border: 1px solid #333;
border-radius: 8px;
}
.box-flat {
border: 1px solid #333;
}
.white_table_graph_header {
border: 1px solid #333;
}
.info_table > tbody > tr > td {
border-bottom: 1px solid #3f3f3f;
}

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

@ -837,3 +837,8 @@ table#simple.floating_form tr[id^="simple-macro_field"] {
table#simple.floating_form tr[id^="simple-macro_field"] > td > input {
width: 50%;
}
td.FF-thresholds-pdd {
padding: 0px !important;
padding-left: 13px !important;
}

4
pandora_console/install.php
View File

@ -130,8 +130,8 @@
</div>
<div style='padding-bottom: 50px'>
<?php
$version = '7.0NG.769';
$build = '230315';
$version = '7.0NG.770';
$build = '230330';
$banner = "v$version Build $build";
error_reporting(0);

2
pandora_console/operation/agentes/alerts_status.php
View File

@ -326,6 +326,7 @@ if (is_metaconsole() === true) {
1,
2,
3,
-3,
-1,
];
} else {
@ -333,6 +334,7 @@ if (is_metaconsole() === true) {
0,
1,
2,
-3,
-1,
];
}

4
pandora_console/operation/agentes/group_view.php
View File

@ -192,7 +192,7 @@ echo '<table width="100%" class="info_table">';
echo "<span id='sumary' class='yellow_background'>".$total_agent_warning.'%</span>';
echo "<span id='sumary' class='green_background'>".$total_agent_ok.'%</span>';
echo "<span id='sumary' class='bg_B2B2B2'>".$total_agent_unknown.'%</span>';
echo "<span id='sumary' class='blue'>".$total_not_init.'%</span>';
echo "<span id='sumary' class='bg_4a83f3'>".$total_not_init.'%</span>';
echo '</td>';
echo "<td align='center'>";
echo "<span id='sumary' class='red_background'>".$total_critical.'%</span>';
@ -295,7 +295,7 @@ if (empty($result_groups) === false) {
echo "<td class='group_view_data center vertical_middle'>";
if (!isset($data['_is_tag_']) && check_acl($config['id_user'], $data['_id_'], 'AW')) {
echo '<a href="index.php?sec=estado&sec2=operation/agentes/group_view&update_netgroup='.$data['_id_'].'">'.html_print_image(
'images/change-active.svg',
'images/force@svg.svg',
true,
[
'border' => '0',

17
pandora_console/operation/agentes/ver_agente.php
View File

@ -1442,22 +1442,9 @@ $alerttab['active'] = ($tab === 'alert');
// Inventory.
$inventoryCount = db_get_num_rows('SELECT id_agent_module_inventory FROM tagent_module_inventory WHERE id_agente = '.$agent['id_agente']);
$inventorytab['text'] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=inventory&id_agente='.$id_agente.'">'.html_print_image(
'images/hardware-software-component@svg.svg',
true,
[
'class' => 'main_menu_icon invert_filter',
'title' => __('Inventory'),
]
).'</a>';
if ($tab == 'inventory') {
$inventorytab['active'] = true;
} else {
$inventorytab['active'] = false;
}
$inventorytab = enterprise_hook('inventory_tab');
if ($inventorytab === ENTERPRISE_NOT_HOOK || $inventoryCount === 0) {
$inventorytab = '';
}
@ -1592,7 +1579,7 @@ if (enterprise_installed() === true && (bool) $config['log_collector'] === true)
$log_viewer_tab['text'] = html_print_menu_button(
[
'href' => 'index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=log_viewer&id_agente='.$id_agente,
'image' => 'images/gm_log.png',
'image' => 'images/gm_log@svg.svg',
'title' => __('Log Viewer'),
],
true

2
pandora_console/operation/events/events.php
View File

@ -820,7 +820,7 @@ if (is_ajax() === true) {
break;
}
$draw_state = '<div class="center">';
$draw_state = '<div class="mrgn_lft_17px">';
$draw_state .= '<span class="invisible">';
$draw_state .= $state;
$draw_state .= '</span>';

2
pandora_console/operation/reporting/graph_viewer.php
View File

@ -423,7 +423,7 @@ if ($view_graph) {
);
if ($graph_return) {
echo '<div style="background-color: white;height: 700px;overflow-y: auto;padding-top:20px;">';
echo '<div class="container-custom-graph">';
if (!is_ajax()) {
echo '<div id="spinner_loading" class="loading invisible" style="display:flex;flex-direction:column-reverse;justify-content:center;align-items:center">';
echo html_print_image('images/spinner.gif', true, ['width' => '20px']);

2
pandora_console/operation/visual_console/view.php
View File

@ -424,7 +424,7 @@ if ($pure === false) {
echo html_print_label(__('Force'), 'force-mode', true);
echo '<a id ="force_check" href="">';
echo html_print_image(
'images/change-active.svg',
'images/force@svg.svg',
true,
[
'title' => __('Force remote checks'),

2
pandora_console/pandora_console.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.770
%define release 230329
%define release 230330
# User and Group under which Apache is running
%define httpd_name httpd

2
pandora_console/pandora_console.rhel7.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.770
%define release 230329
%define release 230330
# User and Group under which Apache is running
%define httpd_name httpd

2
pandora_console/pandora_console.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.770
%define release 230329
%define release 230330
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2

2
pandora_console/views/dashboard/cell.php
View File

@ -54,6 +54,7 @@ if ($manageDashboards !== 0 || $writeDashboards !== 0) {
[
'width' => '16px',
'title' => __('Configure widget'),
'class' => 'invert_filter',
]
);
$output .= '</a> ';
@ -66,6 +67,7 @@ if ($manageDashboards !== 0 || $writeDashboards !== 0) {
[
'width' => '16px',
'title' => __('Delete widget'),
'class' => 'invert_filter',
]
);
$output .= '</a>';

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server
Version: 7.0NG.770-230329
Version: 7.0NG.770-230330
Architecture: all
Priority: optional
Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.770-230329"
pandora_version="7.0NG.770-230330"
package_cpan=0
package_pandora=1

2
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -46,7 +46,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.770";
my $pandora_build = "230329";
my $pandora_build = "230330";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash

2
pandora_server/lib/PandoraFMS/PluginTools.pm
View File

@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.770";
my $pandora_build = "230329";
my $pandora_build = "230330";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );

2
pandora_server/pandora_server.redhat.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil}
%define name pandorafms_server
%define version 7.0NG.770
%define release 230329
%define release 230330
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil}
%define name pandorafms_server
%define version 7.0NG.770
%define release 230329
%define release 230330
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server_installer
View File

@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.770"
PI_BUILD="230329"
PI_BUILD="230330"
MODE=$1
if [ $# -gt 1 ]; then

2
pandora_server/util/pandora_db.pl
View File

@ -35,7 +35,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
my $version = "7.0NG.770 Build 230329";
my $version = "7.0NG.770 Build 230330";
# Pandora server configuration
my %conf;

2
pandora_server/util/pandora_manage.pl
View File

@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
my $version = "7.0NG.770 Build 230329";
my $version = "7.0NG.770 Build 230330";
# save program name for logging
my $progname = basename($0);