From 934be2eaf41097e1e8daeef5b423394e8819be3e Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 16 Feb 2022 10:42:20 +0100
Subject: [PATCH] Updated testing and swap messages

---
 .gitlab-ci.yml                                | 22 +++++++++++++++++--
 .../godmode/um_client/views/offline.php       |  4 ++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5128200eed..ea329e2e57 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,25 @@
 variables:
   GIT_STRATEGY: clone
+  REBRANDING: pandora
 
 test:
   script:
-    - docker pull pandorafms/pandorafms-base:centos6
-    - docker run --rm -h pandorafms -t -v "$CI_PROJECT_DIR:/tmp/pandorafms" pandorafms/pandorafms-base:centos6 /tmp/pandorafms/tests/test.sh
+    - if [ ! -e $CI_PROJECT_DIR/pandora_server/bin/${REBRANDING}_server ]; then cp $CI_PROJECT_DIR/pandora_server/bin/pandora_server $CI_PROJECT_DIR/pandora_server/bin/${REBRANDING}_server ; fi
+    - if [ ! -e $CI_PROJECT_DIR/pandora_server/util/${REBRANDING}_ha.pl ]; then cp $CI_PROJECT_DIR/pandora_server/util/pandora_ha.pl $CI_PROJECT_DIR/pandora_server/util/${REBRANDING}_ha.pl ; fi
+    - if [ ! -e $CI_PROJECT_DIR/pandora_agents/unix/${REBRANDING}_agent ]; then cp $CI_PROJECT_DIR/pandora_agents/unix/pandora_agent $CI_PROJECT_DIR/pandora_agents/unix/${REBRANDING}_agent ; fi
+    - sed -i "s/pandora/$REBRANDING/g" $CI_PROJECT_DIR/pandora_agents/unix/${REBRANDING}_agent
+    - if [ ! -e $CI_PROJECT_DIR/pandora_agents/unix/${REBRANDING}_agent_exec ]; then cp $CI_PROJECT_DIR/pandora_agents/unix/pandora_agent_exec $CI_PROJECT_DIR/pandora_agents/unix/${REBRANDING}_agent_exec ; fi
+    - if [ ! -e $CI_PROJECT_DIR/pandora_agents/unix/${REBRANDING}_revent ]; then cp $CI_PROJECT_DIR/pandora_agents/unix/pandora_revent $CI_PROJECT_DIR/pandora_agents/unix/${REBRANDING}_revent ; fi
+    - if [ ! -e $CI_PROJECT_DIR/pandora_agents/unix/${REBRANDING}_agent_logrotate ]; then cp $CI_PROJECT_DIR/pandora_agents/unix/pandora_agent_logrotate $CI_PROJECT_DIR/pandora_agents/unix/${REBRANDING}_agent_logrotate ; fi
+    - sed -i "s/_PRODUCT_/$REBRANDING/g"  $CI_PROJECT_DIR/pandora_server/Makefile.PL
+    - sed -i "s/TENTACLE_USER=\"pandora\"/TENTACLE_USER=\"$REBRANDING\"/g" $CI_PROJECT_DIR/pandora_server/util/tentacle_serverd
+    - docker pull pandorafms/pandorafms-base:rocky8.5
+    - docker run --rm -e REBRANDING="$REBRANDING" -h pandorafms -t -v "$CI_PROJECT_DIR:/tmp/pandorafms" pandorafms/pandorafms-base:rocky8.5 /tmp/pandorafms/tests/test.sh
+
+test_php_legacy:
+  stage: test
+  before_script:
+    - df -h | grep instaladores | awk '{print $NF}' |xargs umount >/dev/null 2>&1 || true
+  script:
+    - docker pull pandorafms/pandorafms-base:centos7
+    - docker run --rm -h pandorafms -t -v "$CI_PROJECT_DIR:/tmp/pandorafms" pandorafms/pandorafms-base:centos7 /tmp/pandorafms/tests/test_legacy.sh
diff --git a/pandora_console/godmode/um_client/views/offline.php b/pandora_console/godmode/um_client/views/offline.php
index 386b5a0747..28f8556e69 100644
--- a/pandora_console/godmode/um_client/views/offline.php
+++ b/pandora_console/godmode/um_client/views/offline.php
@@ -84,8 +84,8 @@
         'ignoresign': "<?php echo __('Ignore'); ?>",
         'verifysigntitle': "<?php echo __('Verify package signature'); ?>",
         'verifysigns': "<?php echo __('Copy into the textarea the signature validation token you can retrieve from %s and press OK to verify the package, press ignore to avoid signature verification', 'https://support.pandorafms.com'); ?>",
-        'notGoingToInstallUnoficialServerWarning': "<?php echo __('This update does not correspond with next version of %s and is not going to be installed unless patches are allowed. Please enable patches in settings.', get_product_name()); ?>",
-        'notGoingToInstallUnoficialWarning': "<?php echo __('This server update does not correspond with current console version and is not going to be installed unless patches are allowed. Please enable patches in settings.'); ?>",
+        'notGoingToInstallUnoficialServerWarning': "<?php echo __('This server update does not correspond with current console version and is not going to be installed unless patches are allowed. Please enable patches in settings.'); ?>",
+        'notGoingToInstallUnoficialWarning': "<?php echo __('This update does not correspond with next version of %s and is not going to be installed unless patches are allowed. Please enable patches in settings.', get_product_name()); ?>",
     }
 
     var insecureMode = <?php echo ($insecure === true) ? 'true' : 'false'; ?>;