From 815a737a6937dbe1a60a5f54b73895d20fb40a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Fri, 10 Jun 2022 10:17:23 +0200
Subject: [PATCH] Change strings for Update Manager references to WARP update

---
 pandora_console/godmode/menu.php              | 10 ++++----
 pandora_console/godmode/um_client/index.php   |  2 +-
 .../godmode/update_manager/update_manager.php | 24 +++++++++++-------
 .../update_manager/update_manager.setup.php   | 25 ++++++++++---------
 .../include/class/OrderInterpreter.class.php  |  6 ++---
 .../update_manager_client/views/register.php  | 10 ++++----
 6 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index aeecc25273..9d7719dd89 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -525,21 +525,21 @@ $menu_godmode['links']['sub'] = $sub;
 
 // Update Manager
 if (check_acl($config['id_user'], 0, 'PM') && $config['enable_update_manager']) {
-    $menu_godmode['messages']['text'] = __('Update manager');
+    $menu_godmode['messages']['text'] = __('WARP Update');
     $menu_godmode['messages']['id'] = 'god-um_messages';
     $menu_godmode['messages']['sec2'] = '';
 
     $sub = [];
-    $sub['godmode/update_manager/update_manager&tab=offline']['text'] = __('Update Manager offline');
+    $sub['godmode/update_manager/update_manager&tab=offline']['text'] = __('Update offline');
     $sub['godmode/update_manager/update_manager&tab=offline']['id'] = 'Offline';
 
-    $sub['godmode/update_manager/update_manager&tab=online']['text'] = __('Update Manager online');
+    $sub['godmode/update_manager/update_manager&tab=online']['text'] = __('Update online');
     $sub['godmode/update_manager/update_manager&tab=online']['id'] = 'Online';
 
-    $sub['godmode/update_manager/update_manager&tab=setup']['text'] = __('Update Manager options');
+    $sub['godmode/update_manager/update_manager&tab=setup']['text'] = __('Options');
     $sub['godmode/update_manager/update_manager&tab=setup']['id'] = 'Options';
 
-    $sub['godmode/update_manager/update_manager&tab=history']['text'] = __('Update Manager journal');
+    $sub['godmode/update_manager/update_manager&tab=history']['text'] = __('WARP journal');
     $sub['godmode/update_manager/update_manager&tab=history']['id'] = 'Journal';
 
     $menu_godmode['messages']['sub'] = $sub;
diff --git a/pandora_console/godmode/um_client/index.php b/pandora_console/godmode/um_client/index.php
index ebd13796c6..e74045b570 100644
--- a/pandora_console/godmode/um_client/index.php
+++ b/pandora_console/godmode/um_client/index.php
@@ -313,7 +313,7 @@ if (is_array($config) === true) {
         if ($mode === Manager::MODE_ONLINE
             && ($puid === null || $puid === 'OFFLINE')
         ) {
-            ui_print_error_message(__('Update manager online requires registration.'));
+            ui_print_error_message(__('Update online requires registration.'));
         }
 
         if ($mode === Manager::MODE_OFFLINE) {
diff --git a/pandora_console/godmode/update_manager/update_manager.php b/pandora_console/godmode/update_manager/update_manager.php
index da9eb8543d..e880e82a43 100644
--- a/pandora_console/godmode/update_manager/update_manager.php
+++ b/pandora_console/godmode/update_manager/update_manager.php
@@ -39,7 +39,7 @@ $buttons['setup'] = [
     'active' => ($tab == 'setup') ? true : false,
     'text'   => '<a href="'.ui_get_full_url(
         'index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=setup'
-    ).'">'.html_print_image('images/gm_setup.png', true, ['title' => __('Options'), 'class' => 'invert_filter']).'</a>',
+    ).'">'.html_print_image('images/gm_setup.png', true, ['title' => __('Setup'), 'class' => 'invert_filter']).'</a>',
 ];
 
 $buttons['history'] = [
@@ -53,42 +53,48 @@ $buttons['offline'] = [
     'active' => ($tab == 'offline') ? true : false,
     'text'   => '<a href="'.ui_get_full_url(
         'index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=offli'
-    ).'ne">'.html_print_image('images/box.png', true, ['title' => __('Offline update manager'), 'class' => 'invert_filter']).'</a>',
+    ).'ne">'.html_print_image('images/box.png', true, ['title' => __('Offline update'), 'class' => 'invert_filter']).'</a>',
 ];
 
 $buttons['online'] = [
     'active' => ($tab == 'online') ? true : false,
     'text'   => '<a href="'.ui_get_full_url(
         'index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=onlin'
-    ).'e">'.html_print_image('images/op_gis.png', true, ['title' => __('Online update manager'), 'class' => 'invert_filter']).'</a>',
+    ).'e">'.html_print_image('images/op_gis.png', true, ['title' => __('Online update'), 'class' => 'invert_filter']).'</a>',
 ];
 
 switch ($tab) {
     case 'history':
-        $title = __('Update manager » Journal');
+        $title = __('Journal');
     break;
 
     case 'setup':
-        $title = __('Update manager » Setup');
+        $title = __('Setup');
     break;
 
     case 'offline':
-        $title = __('Update manager » Offline');
+        $title = __('Offline');
     break;
 
     case 'online':
     default:
-        $title = __('Update manager » Online');
+        $title = __('Online');
     break;
 }
 
-ui_print_page_header(
+ui_print_standard_header(
     $title,
     'images/gm_setup.png',
     false,
     '',
     true,
-    $buttons
+    $buttons,
+    [
+        [
+            'link'  => '',
+            'label' => 'Warp Update',
+        ],
+    ]
 );
 
 switch ($tab) {
diff --git a/pandora_console/godmode/update_manager/update_manager.setup.php b/pandora_console/godmode/update_manager/update_manager.setup.php
index e22c31031d..a671424bdc 100644
--- a/pandora_console/godmode/update_manager/update_manager.setup.php
+++ b/pandora_console/godmode/update_manager/update_manager.setup.php
@@ -268,17 +268,18 @@ $table->style[$i] = 'font-weight: bolder;width:250px';
 
 $url_update_manager = update_manager_get_url();
 
-$table->data[$i][0] = __('URL update manager:');
+$table->data[$i][0] = __('WARP Update URL');
 $table->data[$i++][1] = html_print_input_text(
     'url_update_manager',
     $url_update_manager,
     __('URL update manager'),
     80,
     255,
+    true,
     true
 );
 
-$table->data[$i][0] = __('Use secured update manager:');
+$table->data[$i][0] = __('Use secured WARP Update');
 $table->data[$i++][1] = html_print_input(
     [
         'type'  => 'switch',
@@ -287,7 +288,7 @@ $table->data[$i++][1] = html_print_input(
     ]
 );
 
-$table->data[$i][0] = __('Proxy server:');
+$table->data[$i][0] = __('Proxy server');
 $table->data[$i++][1] = html_print_input_text(
     'update_manager_proxy_server',
     $update_manager_proxy_server,
@@ -297,7 +298,7 @@ $table->data[$i++][1] = html_print_input_text(
     true
 );
 
-$table->data[$i][0] = __('Proxy port:');
+$table->data[$i][0] = __('Proxy port');
 $table->data[$i++][1] = html_print_input_text(
     'update_manager_proxy_port',
     $update_manager_proxy_port,
@@ -307,7 +308,7 @@ $table->data[$i++][1] = html_print_input_text(
     true
 );
 
-$table->data[$i][0] = __('Proxy user:');
+$table->data[$i][0] = __('Proxy user');
 $table->data[$i++][1] = html_print_input_text(
     'update_manager_proxy_user',
     $update_manager_proxy_user,
@@ -317,7 +318,7 @@ $table->data[$i++][1] = html_print_input_text(
     true
 );
 
-$table->data[$i][0] = __('Proxy password:');
+$table->data[$i][0] = __('Proxy password');
 $table->data[$i++][1] = html_print_input_password(
     'update_manager_proxy_password',
     $update_manager_proxy_password,
@@ -327,7 +328,7 @@ $table->data[$i++][1] = html_print_input_password(
     true
 );
 
-$table->data[$i][0] = __('Allow no-consecutive patches:');
+$table->data[$i][0] = __('Allow no-consecutive patches');
 $table->data[$i++][1] = html_print_switch(
     [
         'name'   => 'allow_offline_patches',
@@ -336,7 +337,7 @@ $table->data[$i++][1] = html_print_switch(
     ]
 );
 
-$table->data[$i][0] = __('Limit to LTS updates:');
+$table->data[$i][0] = __('Limit to LTS updates');
 $table->data[$i++][1] = html_print_switch(
     [
         'name'   => 'lts_updates',
@@ -346,11 +347,11 @@ $table->data[$i++][1] = html_print_switch(
 );
 
 
-$table->data[$i][0] = __('Registration ID:');
-$table->data[$i++][1] = '<i>'.$config['pandora_uid'].'</i>';
+$table->data[$i][0] = __('Registration ID');
+$table->data[$i++][1] = '<i>'.($config['pandora_uid'] ?? __('Not registred yet')).'</i>';
 
 if (update_manager_verify_registration() === true && users_is_admin()) {
-    $table->data[$i][0] = __('Cancel registration:');
+    $table->data[$i][0] = __('Cancel registration');
     $table->data[$i][1] = '<a href="';
     if ((bool) is_metaconsole() === true) {
         $table->data[$i][1] .= ui_get_full_url(
@@ -367,7 +368,7 @@ if (update_manager_verify_registration() === true && users_is_admin()) {
 
 if (license_free()) {
     $config['identification_reminder'] = isset($config['identification_reminder']) ? $config['identification_reminder'] : 1;
-    $table->data[$i][0] = __('Pandora FMS community reminder').ui_print_help_tip(__('Every 8 days, a message is displayed to admin users to remember to register this Pandora instance'), true);
+    $table->data[$i][0] = __('%s community reminder', get_product_name()).ui_print_help_tip(__('Every 8 days, a message is displayed to admin users to remember to register this %s instance', get_product_name()), true);
     $table->data[$i][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button('identification_reminder', 1, '', $config['identification_reminder'], true).'&nbsp;&nbsp;';
     $table->data[$i++][1] .= __('No').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button('identification_reminder', 0, '', $config['identification_reminder'], true);
 }
diff --git a/pandora_console/include/class/OrderInterpreter.class.php b/pandora_console/include/class/OrderInterpreter.class.php
index 25ecfdae64..5762a678a7 100644
--- a/pandora_console/include/class/OrderInterpreter.class.php
+++ b/pandora_console/include/class/OrderInterpreter.class.php
@@ -336,7 +336,7 @@ class OrderInterpreter extends Wizard
                 ),
             ],
             [
-                'name' => __('Update Manager'),
+                'name' => __('WARP Update'),
                 'icon' => ui_get_full_url(
                     'images/menu/um_messages.menu_gray.png'
                 ),
@@ -404,10 +404,10 @@ class OrderInterpreter extends Wizard
                         '.$value['name'].'</a><br>';
                     }
 
-                    $iterator ++;
+                    $iterator++;
 
                     if ($iterator > 10) {
-                        $more_results ++;
+                        $more_results++;
                     }
                 }
             }
diff --git a/pandora_console/update_manager_client/views/register.php b/pandora_console/update_manager_client/views/register.php
index 45767ea1cc..7f126c79b6 100644
--- a/pandora_console/update_manager_client/views/register.php
+++ b/pandora_console/update_manager_client/views/register.php
@@ -45,7 +45,7 @@ $product_name = get_product_name(); ?>
 </head>
 
 <div id="registration_wizard" title="
-    <?php echo __('Register to Update Manager'); ?>
+    <?php echo __('Register to WARP Update'); ?>
     " class="invisible">
     <div class="register_update_manager">
         <?php echo html_print_image('images/pandora_circle_big.png', true); ?>
@@ -59,10 +59,10 @@ $product_name = get_product_name(); ?>
         <p>
             <?php
             echo __(
-                'When you subscribe to the %s Update Manager service, you accept that we
+                'When you subscribe to the WARP update service for %s, you accept that we
             register your %s instance as an identifier on a database owned by %s. This data will solely be used to
             provide you with information about %s and will not be conceded to third parties. You can unregister from
-            said database at any time from the Update Manager options.',
+            said database at any time from the WARP update options.',
                 $product_name,
                 $product_name,
                 $product_name,
@@ -72,7 +72,7 @@ $product_name = get_product_name(); ?>
         </p>
 
         <p>
-            <?php echo __('Visit our privacy policy for more information'); ?>: 
+            <?php echo __('Visit our privacy policy for more information'); ?>:
             <a href="https://pandorafms.com/privacy-policy/" target="_blank">https://pandorafms.com/privacy-policy/</a>
         </p>
 
@@ -109,7 +109,7 @@ $product_name = get_product_name(); ?>
 <!-- Verification modal.. -->
 <div id="reg_ensure_cancel" title="Confirmation Required" class="invisible">
     <div class="font_12_20">
-        <?php echo __('Are you sure you don\'t want to use update manager?'); ?>
+        <?php echo __('Are you sure you don\'t want to use WARP update?'); ?>
         <p>
             <?php
             echo __(