refactor: improve code

pluginsGLPI · Feb 6, 2024 · 0438c55 · 0438c55
1 parent ed7e704
commit 0438c55
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/inc/abstracttarget.class.php b/inc/abstracttarget.class.php
@@ -564,13 +564,17 @@ public function prepareInputForClone($input) {
       return $input;
    }
 
-   protected static function getTemplateByName(string $name) {
+   protected static function getTemplateByName(string $name): int {
       $targetTemplateType = (new static())->getTemplateItemtypeName();
       $targetTemplate = new $targetTemplateType();
       $targetTemplate->getFromDBByCrit([
          'name' => $name,
       ]);
 
-      return $targetTemplate;
+      if ($targetTemplate->isNewItem()) {
+         return 0;
+      }
+
+      return $targetTemplate->getID();
    }
 }
diff --git a/inc/targetchange.class.php b/inc/targetchange.class.php
@@ -290,13 +290,12 @@ public static function import(PluginFormcreatorLinker $linker, array $input = []
 
       // Find template by name
       $input['changetemplates_id'] = 0;
-      if ($input['_changetemplate'] !== '') {
-         $targetTemplate = self::getTemplateByName($input['_changetemplate'] ?? '');
-         if ($targetTemplate->isNewItem()) {
+      if (is_string($input['_changetemplate']) && strlen($input['_changetemplate']) > 0) {
+         $input['changetemplates_id'] = self::getTemplateByName($input['_changetemplate'] ?? '');
+         if ($input['changetemplates_id'] === 0) {
             $typeName = strtolower(self::getTypeName());
             throw new ImportFailureException(sprintf(__('Failed to add or update the %1$s %2$s: It uses a non existent template', 'formceator'), $typeName, $input['name']));
          }
-         $input['changetemplates_id'] = $targetTemplate->getID();
       }
 
       // Add or update

diff --git a/inc/targetproblem.class.php b/inc/targetproblem.class.php
@@ -527,15 +527,13 @@ public static function import(PluginFormcreatorLinker $linker, array $input = []
 
       // Find template by name
       $input['problemtemplates_id'] = 0;
-      if ($input['_problemtemplate'] !== '') {
-         $targetTemplate = self::getTemplateByName($input['_problemtemplate'] ?? '');
-         if ($targetTemplate->isNewItem()) {
+      if (is_string($input['_problemtemplate']) && strlen($input['_problemtemplate']) > 0) {
+         $input['problemtemplates_id'] = self::getTemplateByName($input['_problemtemplate'] ?? '');
+         if ($input['problemtemplates_id'] === 0) {
             $typeName = strtolower(self::getTypeName());
-            throw new ImportFailureException(sprintf(__('Failed to add or update the %1$s %2$s: It uses a non existent template ', 'formceator'), $typeName, $input['name']));
+            throw new ImportFailureException(sprintf(__('Failed to add or update the %1$s %2$s: It uses a non existent template', 'formceator'), $typeName, $input['name']));
          }
-         $input['problemtemplates_id'] = $targetTemplate->getID();
       }
-
       // Add or update
       $originalId = $input[$idKey];
       $item->skipChecks = true;

diff --git a/inc/targetticket.class.php b/inc/targetticket.class.php
@@ -1406,13 +1406,12 @@ public static function import(PluginFormcreatorLinker $linker, array $input = []
 
       // Find template by name
       $input['tickettemplates_id'] = 0;
-      if ($input['_tickettemplate'] !== '') {
-         $targetTemplate = self::getTemplateByName($input['_tickettemplate'] ?? '');
-         if ($targetTemplate->isNewItem()) {
+      if (is_string($input['_tickettemplate']) && strlen($input['_tickettemplate']) > 0) {
+         $input['tickettemplates_id'] = self::getTemplateByName($input['_tickettemplate'] ?? '');
+         if ($input['tickettemplates_id'] === 0) {
             $typeName = strtolower(self::getTypeName());
             throw new ImportFailureException(sprintf(__('Failed to add or update the %1$s %2$s: It uses a non existent template', 'formceator'), $typeName, $input['name']));
          }
-         $input['tickettemplates_id'] = $targetTemplate->getID();
       }
 
       // Add or update