Fix files regeneration during install

front/regenerate_files.php

@@ -33,6 +33,6 @@
 
 Session::checkRight('entity', READ);
 
-plugin_fields_checkFiles(true);
+plugin_fields_checkFiles();
 
 Html::back();

hook.php

@@ -90,9 +90,6 @@ function plugin_fields_install() {
    echo "</tr>";
    echo "</table></center>";
 
-   // Check class and front files for existing containers and dropdown fields
-   plugin_fields_checkFiles(true);
-
    return true;
 }
 

inc/container.class.php

@@ -207,11 +207,12 @@ static function install(Migration $migration, $version) {
       }
 
       $migration->displayMessage(__("Updating generated containers files", "fields"));
+      $obj        = new self;
+      $containers = $obj->find();
+
       // -> 0.90-1.3: generated class moved
       // OLD path: GLPI_ROOT."/plugins/fields/inc/$class_filename"
       // NEW path: PLUGINFIELDS_CLASS_PATH . "/$class_filename"
-      $obj        = new self;
-      $containers = $obj->find();
       foreach ($containers as $container) {
          //First, drop old fields from plugin directories
          $itemtypes = !empty($container['itemtypes'])
@@ -230,9 +231,11 @@ static function install(Migration $migration, $version) {
                unlink(PLUGINFIELDS_DIR."/inc/$injclass_filename");
             }
          }
+      }
 
-         //Second, create new files
-         self::generateTemplate($container);
+      // Regenerate files and install missing tables
+      foreach ($fields as $field) {
+         self::create($field);
       }
 
       return true;
@@ -484,13 +487,18 @@ function post_addItem() {
       //Create label translation
       PluginFieldsLabelTranslation::createForItem($this);
 
+      self::create($this->fields);
+   }
+
+   public static function create($fields) {
       //create class file
-      if (!self::generateTemplate($this->fields)) {
+      if (!self::generateTemplate($fields)) {
          return false;
       }
-      foreach (json_decode($this->fields['itemtypes']) as $itemtype) {
+
+      foreach (json_decode($fields['itemtypes']) as $itemtype) {
          //install table for receive field
-         $classname = self::getClassname($itemtype, $this->fields['name']);
+         $classname = self::getClassname($itemtype, $fields['name']);
          $classname::install();
       }
    }

inc/dropdown.class.php

@@ -45,13 +45,15 @@ static function install(Migration $migration, $version) {
       $toolbox->fixFieldsNames($migration, ['type' => 'dropdown']);
 
       $migration->displayMessage(__("Updating generated dropdown files", "fields"));
+
+      $obj = new PluginFieldsField;
+      $fields = $obj->find(['type' => 'dropdown']);
+
       // -> 0.90-1.3: generated class moved
       // OLD path: GLPI_ROOT."/plugins/fields/inc/$class_filename"
       // NEW path: PLUGINFIELDS_CLASS_PATH . "/$class_filename"
       // OLD path: GLPI_ROOT."/plugins/fields/front/$class_filename"
       // NEW path: PLUGINFIELDS_FRONT_PATH . "/$class_filename"
-      $obj = new PluginFieldsField;
-      $fields = $obj->find(['type' => 'dropdown']);
       foreach ($fields as $field) {
          //First, drop old fields from plugin directories
          $class_filename = $field['name']."dropdown.class.php";
@@ -68,8 +70,10 @@ static function install(Migration $migration, $version) {
          if (file_exists(PLUGINFIELDS_DIR."/front/$form_filename")) {
             unlink(PLUGINFIELDS_DIR."/front/$form_filename");
          }
+      }
 
-         //Second, create new files
+      // Regenerate files and install missing tables
+      foreach ($fields as $field) {
          self::create($field);
       }
 

setup.php

@@ -221,47 +221,28 @@ function plugin_fields_check_prerequisites() {
  *
  * @return void
  */
-function plugin_fields_checkFiles($force = false) {
+function plugin_fields_checkFiles() {
    global $DB;
 
-   $plugin = new Plugin();
-
-   if ($force) {
-      //clean all existing files
-      array_map('unlink', glob(PLUGINFIELDS_DOC_DIR.'/*/*'));
-   }
-
-   if (isset($_SESSION['glpiactiveentities'])
-      && $plugin->isInstalled('fields')
-      && $plugin->isActivated('fields')
-      && Session::getLoginUserID()) {
+   // Clean all existing files
+   array_map('unlink', glob(PLUGINFIELDS_DOC_DIR.'/*/*'));
 
-      if ($DB->tableExists(PluginFieldsContainer::getTable())) {
-         $container_obj = new PluginFieldsContainer();
-         $containers    = $container_obj->find();
+   // Regenerate containers
+   if ($DB->tableExists(PluginFieldsContainer::getTable())) {
+      $container_obj = new PluginFieldsContainer();
+      $containers    = $container_obj->find();
 
-         foreach ($containers as $container) {
-            $itemtypes = (strlen($container['itemtypes']) > 0)
-               ? json_decode($container['itemtypes'], true)
-               : [];
-            foreach ($itemtypes as $itemtype) {
-               $classname = PluginFieldsContainer::getClassname($itemtype, $container['name']);
-               if (!class_exists($classname)) {
-                  PluginFieldsContainer::generateTemplate($container);
-               }
-
-               // regenerate table (and fields) also
-               $classname::install($container['id']);
-            }
-         }
+      foreach ($containers as $container) {
+         PluginFieldsContainer::create($container);
       }
+   }
 
-      if ($DB->tableExists(PluginFieldsField::getTable())) {
-         $fields_obj = new PluginFieldsField();
-         $fields     = $fields_obj->find(['type' => 'dropdown']);
-         foreach ($fields as $field) {
-            PluginFieldsDropdown::create($field);
-         }
+   // Regenerate dropdowns
+   if ($DB->tableExists(PluginFieldsField::getTable())) {
+      $fields_obj = new PluginFieldsField();
+      $fields     = $fields_obj->find(['type' => 'dropdown']);
+      foreach ($fields as $field) {
+         PluginFieldsDropdown::create($field);
       }
    }
 }