fix(git): resync 21.10.x to dev-21.10.x (#11499)

.github/CODEOWNERS

@@ -1,12 +1,15 @@
-/.github/       @centreon/centreon-ci
-/.git*          @centreon/centreon-ci
-/.project       @centreon/centreon-ci
-/Jenkinsfile    @centreon/centreon-ci
-/selinux/       @centreon/centreon-ci
-/project/       @centreon/centreon-ci
-*.sh            @centreon/centreon-ci
+/.github/       @centreon/centreon-devops
+/.git*          @centreon/centreon-devops
+/.project       @centreon/centreon-devops
+/Jenkinsfile    @centreon/centreon-devops
+/selinux/       @centreon/centreon-devops
+/project/       @centreon/centreon-devops
+*.sh            @centreon/centreon-devops
 
-*.po            @ghost
+/.snyk				@centreon/centreon-security
+/sonar-project.properties	@centreon/centreon-security
+
+*.po            @centreon/centreon-documentation
 
 /src/                  @centreon/centreon-php
 /config/               @centreon/centreon-php

Jenkinsfile

@@ -461,6 +461,4 @@ try {
             "*COMMIT*: <https://github.com/centreon/centreon/commit/${source.COMMIT}|here> by ${source.COMMITTER}\n" +
             "*INFO*: ${e}"
   }
-
-  currentBuild.result = 'FAILURE'
 }

composer.json

@@ -26,7 +26,7 @@
         "symfony/twig-bundle": "^4.4",
         "symfony/var-dumper": "4.4.*",
         "symfony/web-profiler-bundle": "^4.4",
-        "twig/twig": "^2.0",
+        "twig/twig": "2.*",
         "webmozart/assert": "^1.8",
         "zircote/swagger-php": "^3.0"
     },
@@ -51,7 +51,7 @@
         "phpdocumentor/reflection-docblock": "^5.2",
         "pimple/pimple": "^3.2",
         "sensio/framework-extra-bundle": "^5.3",
-        "smarty/smarty": "^3.1",
+        "smarty/smarty": "3.*",
         "smarty-gettext/smarty-gettext": "^1.6",
         "symfony/console": "4.4.*",
         "symfony/dotenv": "4.4.*",

lang/es_ES.UTF-8/LC_MESSAGES/messages.po

@@ -9079,10 +9079,6 @@ msgstr "Compruebe si el servicio está parado"
 msgid "Preexec definition"
 msgstr "Definiendo el comando PREEXEC"
 
-#: centreon-web/www/include/configuration/configObject/traps/formTraps.php:360
-msgid "The same OID element already exists"
-msgstr "El mismo OID ya existe."
-
 #: centreon-web/www/include/configuration/configObject/traps/formTraps.php:368
 msgid "Advanced matching rules"
 msgstr "Reglas de correspondencia avanzadas"
@@ -14745,7 +14741,7 @@ msgid "Clear filter"
 msgstr ""
 
 msgid "Last check with OK status"
-msgstr "" 
+msgstr ""
 
 # msgid "Status type"
 # msgstr ""
@@ -14757,4 +14753,7 @@ msgstr ""
 # msgstr ""
 
 # msgid "Force active checks"
-# msgstr ""
+# msgstr ""
+
+#  msgid "Warning, maximum size exceeded for input '%s' (max: %d), it will be truncated upon saving"
+#  msgstr ""

lang/fr_FR.UTF-8/LC_MESSAGES/messages.po

@@ -9564,10 +9564,6 @@ msgstr "Contrôle si le service est en plage de maintenance"
 msgid "Preexec definition"
 msgstr "Définition de la commande PREEXEC"
 
-#: centreon-web/www/include/configuration/configObject/traps/formTraps.php:360
-msgid "The same OID element already exists"
-msgstr "Le même OID existe déjà"
-
 #: centreon-web/www/include/configuration/configObject/traps/formTraps.php:368
 msgid "Advanced matching rules"
 msgstr "Règles de correspondance avancées"
@@ -16325,4 +16321,7 @@ msgid "Your new password and autologin key must be different"
 msgstr "Votre nouveau mot de passe et votre clé d'autologin doivent être différents"
 
 # msgid "Force active checks"
-# msgstr "Forcer les contrôles actif"
+# msgstr "Forcer les contrôles actif"
+
+msgid "Warning, maximum size exceeded for input '%s' (max: %d), it will be truncated upon saving"
+msgstr "Attention, taille maximale dépassée pour le champ '%s' (max: %d), il sera tronqué à l'enregistrement"

lang/pt_BR.UTF-8/LC_MESSAGES/messages.po

@@ -10237,10 +10237,6 @@ msgstr "Checagem de Manutenção"
 msgid "Preexec definition"
 msgstr "Definição de pré-execução"
 
-#: centreon-web/www/include/configuration/configObject/traps/formTraps.php:376
-msgid "The same OID element already exists"
-msgstr "O mesmo OID já existe"
-
 #: centreon-web/www/include/configuration/configObject/traps/formTraps.php:384
 msgid "Advanced matching rules"
 msgstr "Regras de correspondencia avançada"
@@ -15208,4 +15204,7 @@ msgstr ""
 # msgstr ""
 
 # msgid "Force active checks"
-# msgstr ""
+# msgstr ""
+
+#  msgid "Warning, maximum size exceeded for input '%s' (max: %d), it will be truncated upon saving"
+#  msgstr ""

lang/pt_PT.UTF-8/LC_MESSAGES/messages.po

@@ -10238,10 +10238,6 @@ msgstr "Checagem de Manutenção"
 msgid "Preexec definition"
 msgstr "Definição de pré-execução"
 
-#: centreon-web/www/include/configuration/configObject/traps/formTraps.php:376
-msgid "The same OID element already exists"
-msgstr "O mesmo OID já existe"
-
 #: centreon-web/www/include/configuration/configObject/traps/formTraps.php:384
 msgid "Advanced matching rules"
 msgstr "Regras de correspondencia avançada"
@@ -15196,4 +15192,7 @@ msgstr ""
 # msgstr ""
 
 # msgid "Force active checks"
-# msgstr ""
+# msgstr ""
+
+#  msgid "Warning, maximum size exceeded for input '%s' (max: %d), it will be truncated upon saving"
+#  msgstr ""

lib/perl/centreon/script.pm

@@ -142,8 +142,10 @@ sub parse_options {
     die "Command line error" if !GetOptions(%{$self->{options}});
     pod2usage(-exitval => 1, -input => $FindBin::Bin . "/" . $FindBin::Script) if $self->{help};
     if ($self->{noconfig} == 0) {
-        require $self->{config_file};
-        $self->{centreon_config} = $centreon_config;
+        if (-e "$self->{config_file}") {
+            require $self->{config_file};
+            $self->{centreon_config} = $centreon_config;
+        }
     }
 }