From a747308b268e4d3c9c1b04b1c5f721473e6e9b04 Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Mon, 22 Jan 2024 16:21:51 +0100
Subject: [PATCH] #12636 fix errors

---
 pandora_console/godmode/setup/os.builder.php |  6 ++--
 pandora_console/godmode/setup/os.php         |  8 ++++++
 pandora_console/include/functions_ui.php     | 30 ++++++++++++++------
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/pandora_console/godmode/setup/os.builder.php b/pandora_console/godmode/setup/os.builder.php
index 6313aa3edd..4f7b77099b 100644
--- a/pandora_console/godmode/setup/os.builder.php
+++ b/pandora_console/godmode/setup/os.builder.php
@@ -48,7 +48,7 @@ if ($idOS > 0) {
 } else {
     $name = io_safe_input(strip_tags(trim(io_safe_output((string) get_parameter('name')))));
     $description = io_safe_input(strip_tags(io_safe_output((string) get_parameter('description'))));
-    $icon = get_parameter('icon', 0);
+    $icon = get_parameter('icon', 'os@svg.svg');
 }
 
 $icon_upload = get_parameter('icon_upload', null);
@@ -246,7 +246,7 @@ $iconData[] = html_print_select(
     'icon',
     $icon,
     'show_icon_OS();',
-    __('None'),
+    '',
     0,
     true
 );
@@ -356,6 +356,8 @@ function get_list_os_icons_dir()
         }
     }
 
+    $return['os@svg.svg'] = __('None');
+
     return $return;
 }
 
diff --git a/pandora_console/godmode/setup/os.php b/pandora_console/godmode/setup/os.php
index dcfe95ecdb..403232c868 100644
--- a/pandora_console/godmode/setup/os.php
+++ b/pandora_console/godmode/setup/os.php
@@ -88,6 +88,14 @@ switch ($tab) {
     break;
 
     case 'manage_os':
+        $id_os = get_parameter('id_os', '');
+        if ($id_os !== '') {
+            $headerTitle = __('Edit OS');
+        } else {
+            $headerTitle = __('Create OS');
+        }
+    break;
+
     case 'list':
         if ($action === 'edit') {
             $headerTitle = __('Edit OS');
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index d6078c56a7..f36b024ac1 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -969,15 +969,27 @@ function ui_print_os_icon(
                 $options['title'] = $os_name;
             }
 
-            $output = html_print_image(
-                'images/'.$subfolder.'/'.$icon,
-                true,
-                $options,
-                false,
-                $relative,
-                $no_in_meta,
-                true
-            );
+            if ($icon === '.png') {
+                $output = html_print_image(
+                    'images/os@svg.svg',
+                    true,
+                    $options,
+                    false,
+                    $relative,
+                    $no_in_meta,
+                    true
+                );
+            } else {
+                $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 . "'>";