From d006bc3c3a6d84d182b5e135f7de6798ff779d78 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Wed, 12 Apr 2023 12:23:54 +0200 Subject: [PATCH 1/6] #10909 Fix icon group --- pandora_console/godmode/groups/group_list.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php index cbe9cf51f0..ee0cd1c6d2 100644 --- a/pandora_console/godmode/groups/group_list.php +++ b/pandora_console/godmode/groups/group_list.php @@ -920,8 +920,10 @@ if ($tab == 'tree') { } if ($group['icon'] != '') { + $extension = pathinfo($group['icon'], PATHINFO_EXTENSION); + $extension = (empty($extension) === true) ? '.png' : ''; $table->data[$key][2] = html_print_image( - 'images/'.$group['icon'], + 'images/'.$group['icon'].$extension, true, [ 'style' => '', From 2bb016474a32f180e463a36b4407bdd91b52f32c Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Wed, 12 Apr 2023 13:37:51 +0200 Subject: [PATCH 2/6] #10909 Fix icon group 2 --- .../godmode/groups/configure_group.php | 28 +++++++++++++++++-- pandora_console/godmode/groups/group_list.php | 13 +++++++-- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/pandora_console/godmode/groups/configure_group.php b/pandora_console/godmode/groups/configure_group.php index 8d81d44540..88966378de 100644 --- a/pandora_console/godmode/groups/configure_group.php +++ b/pandora_console/godmode/groups/configure_group.php @@ -120,6 +120,16 @@ if (is_metaconsole() === true) { // Data before table. $files = list_files(((is_metaconsole() === true) ? '../../' : '').'images/', '@groups.svg', 1, 0); +$files_old = list_files('images/groups_small/', 'png', 1, 0); +foreach ($files_old as $key => $f) { + // Remove from the list the non-desired .png files. + if (strpos($f, '.bad.png') !== false || strpos($f, '.default.png') !== false || strpos($f, '.ok.png') !== false || strpos($f, '.warning.png') !== false) { + unset($files_old[$key]); + } +} + +$files = array_merge($files, $files_old); + $table = new stdClass(); $table->width = '100%'; $table->class = 'databox filter-table-adv'; @@ -133,10 +143,19 @@ $table->data[0][0] = html_print_label_input_block( html_print_input_text('name', $name, '', 35, 100, true) ); +$extension = pathinfo($icon, PATHINFO_EXTENSION); +if (empty($extension) === true) { + $icon .= '.png'; +} + $input_icon = html_print_select($files, 'icon', $icon, '', 'None', '', true, false, true, '', false, 'width: 100%;'); $input_icon .= ' '; if (empty($icon) === false) { - $input_icon .= html_print_image('images/'.$icon, true); + if (empty($extension) === true || $extension === 'png') { + $input_icon .= html_print_image('images/groups_small/'.$icon, true); + } else { + $input_icon .= html_print_image('images/'.$icon, true); + } } $input_icon .= ''; @@ -304,12 +323,17 @@ echo ''; function icon_changed () { var inputs = []; var data = this.value; + var extension = data.split('.').pop(); $('#icon_preview').fadeOut ('normal', function () { $('#icon_preview').empty (); if (data != "") { var params = []; params.push("get_image_path=1"); - params.push("img_src=images/" + data); + if (extension === 'png') { + params.push("img_src=images/groups_small/" + data); + } else { + params.push("img_src=images/" + data); + } params.push("page=include/ajax/skins.ajax"); params.push("only_src=1"); jQuery.ajax ({ diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php index ee0cd1c6d2..4647231927 100644 --- a/pandora_console/godmode/groups/group_list.php +++ b/pandora_console/godmode/groups/group_list.php @@ -921,9 +921,18 @@ if ($tab == 'tree') { if ($group['icon'] != '') { $extension = pathinfo($group['icon'], PATHINFO_EXTENSION); - $extension = (empty($extension) === true) ? '.png' : ''; + if (empty($extension) === true) { + $group['icon'] .= '.png'; + } + + if (empty($extension) === true || $extension === 'png') { + $path = 'images/groups_small/'.$group['icon']; + } else { + $path = 'images/'.$group['icon']; + } + $table->data[$key][2] = html_print_image( - 'images/'.$group['icon'].$extension, + $path, true, [ 'style' => '', From 7570e0d3fbdd654ce04e83545d4e3f6629c71b48 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Wed, 12 Apr 2023 15:10:05 +0200 Subject: [PATCH 3/6] #10909 Fix icon group 3 --- pandora_console/include/functions_ui.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 11670b33f6..1957c2765d 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -713,6 +713,10 @@ function ui_print_group_icon($id_group, $return=false, $path='', $style='', $lin $output = ''; $icon = ($id_group > 0) ? (string) db_get_value('icon', 'tgrupo', 'id_grupo', (int) $id_group) : 'unknown@groups.svg'; + $extension = pathinfo($icon, PATHINFO_EXTENSION); + if (empty($extension) === true) { + $icon .= '.png'; + } // Don't show link in metaconsole. if (is_metaconsole() === true) { @@ -756,10 +760,14 @@ function ui_print_group_icon($id_group, $return=false, $path='', $style='', $lin } } - $icon = (str_contains($icon, '.svg') === true) ? $icon : $icon.'.svg'; + $icon = (str_contains($icon, '.svg') === true || str_contains($icon, '.png') === true) ? $icon : $icon.'.svg'; + $folder = ''; + if (str_contains($icon, '.png')) { + $folder = 'groups_small/'; + } $output .= html_print_image( - 'images/'.$icon, + 'images/'.$folder.$icon, true, [ 'style' => $style, From cd030620b20d9ffab5b1acd0b29d286c2fa4417f Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Wed, 12 Apr 2023 15:51:02 +0200 Subject: [PATCH 4/6] #10909 Fix icon group 4 --- pandora_console/include/javascript/tree/TreeController.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pandora_console/include/javascript/tree/TreeController.js b/pandora_console/include/javascript/tree/TreeController.js index 841e48dbe1..39b97c9c81 100644 --- a/pandora_console/include/javascript/tree/TreeController.js +++ b/pandora_console/include/javascript/tree/TreeController.js @@ -652,12 +652,19 @@ var TreeController = { typeof element.icon != "undefined" && element.icon.length > 0 ) { + var extension = element.icon.split(".").pop(); + if (extension === element.icon) { + element.icon = element.icon + ".png"; + } $content.append( '
' ); From b186d513293d4df3ed16ce15fcde51eac4105526 Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 12 Apr 2023 17:06:58 +0200 Subject: [PATCH 5/6] fix icons pandora_enterprise#10909 --- pandora_console/include/javascript/tree/TreeController.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pandora_console/include/javascript/tree/TreeController.js b/pandora_console/include/javascript/tree/TreeController.js index 39b97c9c81..59a4f43d50 100644 --- a/pandora_console/include/javascript/tree/TreeController.js +++ b/pandora_console/include/javascript/tree/TreeController.js @@ -653,9 +653,6 @@ var TreeController = { element.icon.length > 0 ) { var extension = element.icon.split(".").pop(); - if (extension === element.icon) { - element.icon = element.icon + ".png"; - } $content.append( '
' ); } else if ( From 3a9b8d31bfd36deab126a3a6f9fb3f23c7ed8dae Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 12 Apr 2023 17:21:27 +0200 Subject: [PATCH 6/6] fix icons pandora_enterprise#10909 --- pandora_console/include/functions_groups.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pandora_console/include/functions_groups.php b/pandora_console/include/functions_groups.php index 02d0f434bb..d2d77b241a 100644 --- a/pandora_console/include/functions_groups.php +++ b/pandora_console/include/functions_groups.php @@ -445,6 +445,15 @@ function groups_get_icon($id_group) } else { $icon = (string) db_get_value('icon', 'tgrupo', 'id_grupo', (int) $id_group); + $extension = pathinfo($icon, PATHINFO_EXTENSION); + if (empty($extension) === true) { + $icon .= '.png'; + } + + if (empty($extension) === true || $extension === 'png') { + $icon = 'groups_small/'.$icon; + } + if (empty($icon) === true) { $icon = 'unknown@groups.svg'; }