Fix certificates expirations dates

CHANGELOG.md

@@ -5,10 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased]
+## [unreleased] - 
 
 ### Fixed
-
+- Fix injection to the `date_expiration` of certificates
 - Fix the `Task completed` message during plugin update
 
 ## [2.14.3] - 2025-09-16

inc/applianceinjection.class.php

@@ -50,6 +50,11 @@ public function connectedTo()
         return [];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
    /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()
    **/

inc/autoupdatesysteminjection.class.php

@@ -55,6 +55,11 @@ public function connectedTo()
         return [];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     public function getOptions($primary_type = '')
     {

inc/budgetinjection.class.php

@@ -56,6 +56,11 @@ public function connectedTo()
         return [];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/cartridgeiteminjection.class.php

@@ -55,6 +55,11 @@ public function connectedTo()
         return [];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/certificateinjection.class.php

@@ -50,6 +50,11 @@ public function connectedTo()
         return [];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
    /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()
    **/
@@ -70,6 +75,9 @@ public function getOptions($primary_type = '')
             "bool"           => [9, 86]
         ];
 
+        // Add date check type to Expiration date Search Option
+        $tab[10]['checktype']    = 'date';
+
         return PluginDatainjectionCommonInjectionLib::addToSearchOptions($tab, $options, $this);
     }
 

inc/commoninjectionlib.class.php

@@ -930,10 +930,10 @@ private function setValueForItemtype($itemtype, $field, $value, $fromdb = false)
         if ($itemtype === User::class && $field === "pdffont" && $fromdb) {
             return;
         }
+        $injectionClass = self::getInjectionClassInstance($itemtype);
        // TODO awfull hack, text ftom CSV set more than once, so check if "another" value
         if (isset($this->values[$itemtype][$field]) && $this->values[$itemtype][$field] != $value) {
            // Data set twice (probably CSV + Additional info)
-            $injectionClass = self::getInjectionClassInstance($itemtype);
             $option = self::findSearchOption($injectionClass->getOptions($itemtype), $field);
 
             if (isset($option['displaytype']) && $option['displaytype'] == 'multiline_text') {
@@ -955,7 +955,7 @@ private function setValueForItemtype($itemtype, $field, $value, $fromdb = false)
             }
         } else { // First value
             if (empty($value)) {
-                if (isForeignKeyField($field) || (strpos($field, 'is_') !== false)) {
+                if (isForeignKeyField($field) || (strpos($field, 'is_') !== false) || (method_exists($injectionClass, 'isNullable') && !$injectionClass->isNullable($field))) {
                     // If the field is an id, we set it to 0
                     $this->values[$itemtype][$field] = self::DROPDOWN_EMPTY_VALUE;
                 } else {
@@ -1596,7 +1596,6 @@ public function processAddOrUpdate()
 
                     foreach ($this->values as $itemtype => $data) {
                        //Do not process primary_type
-
                         if ($itemtype != get_class($item)) {
                             $injectionClass = self::getInjectionClassInstance($itemtype);
                             $item           = new $itemtype();

inc/computer_iteminjection.class.php

@@ -64,6 +64,11 @@ public function connectedTo()
         return $CFG_GLPI["directconnect_types"];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/computerinjection.class.php

@@ -56,6 +56,11 @@ public function connectedTo()
         return [];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/computermodelinjection.class.php

@@ -55,6 +55,11 @@ public function connectedTo()
         return [];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/computertypeinjection.class.php

@@ -55,6 +55,11 @@ public static function getTable($classname = null)
         return $parenttype::getTable();
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/consumableiteminjection.class.php

@@ -55,6 +55,11 @@ public function connectedTo()
         return [];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/contact_supplierinjection.class.php

@@ -55,6 +55,11 @@ public function connectedTo()
         return ['Contact', 'Supplier'];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/contactinjection.class.php

@@ -55,6 +55,11 @@ public function connectedTo()
         return ['Supplier'];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/contacttypeinjection.class.php

@@ -55,6 +55,11 @@ public function connectedTo()
         return [];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/contract_iteminjection.class.php

@@ -60,6 +60,11 @@ public function connectedTo()
         return $CFG_GLPI["contract_types"];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/contract_supplierinjection.class.php

@@ -55,6 +55,11 @@ public function connectedTo()
         return [];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/contractinjection.class.php

@@ -55,6 +55,11 @@ public function connectedTo()
         return [];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/contracttypeinjection.class.php

@@ -55,6 +55,11 @@ public function connectedTo()
         return [];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/databaseinjection.class.php

@@ -56,6 +56,11 @@ public function connectedTo()
         return [];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/databaseinstanceinjection.class.php

@@ -58,6 +58,11 @@ public function connectedTo()
         return $CFG_GLPI["databaseinstance_types"];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/devicecaseinjection.class.php

@@ -55,6 +55,11 @@ public function connectedTo()
         return ["Computer"];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/devicecasetypeinjection.class.php

@@ -55,6 +55,11 @@ public function connectedTo()
         return [];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/devicecontrolinjection.class.php

@@ -55,6 +55,11 @@ public function connectedTo()
         return ["Computer"];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/devicedriveinjection.class.php

@@ -55,6 +55,11 @@ public function connectedTo()
         return ["Computer"];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/deviceecasetypeinjection.class.php

@@ -55,6 +55,11 @@ public function connectedTo()
         return [];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/deviceharddriveinjection.class.php

@@ -57,6 +57,11 @@ public function connectedTo()
         return $CFG_GLPI['itemdeviceharddrive_types'];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/devicememoryinjection.class.php

@@ -57,6 +57,11 @@ public function connectedTo()
         return $CFG_GLPI['itemdevicememory_types'];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/devicememorytypeinjection.class.php

@@ -55,6 +55,11 @@ public function connectedTo()
         return [];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/devicemotherboardinjection.class.php

@@ -57,6 +57,11 @@ public function connectedTo()
         return $CFG_GLPI['itemdevicemotherboard_types'];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()

inc/devicenetworkcardinjection.class.php

@@ -55,6 +55,11 @@ public function connectedTo()
         return ["Computer"];
     }
 
+    public function isNullable($field)
+    {
+        return true; // By default, all fields can be null
+    }
+
 
     /**
     * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions()