From f37649f5bbad07d94452ffab7c267f445c4c0294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@fusiondirectory.org>
Date: Thu, 12 Nov 2020 12:15:09 +0100
Subject: [PATCH] :ambulance: fix(setup) Fix crashes and problems in web setup

issue #6122
---
 setup/class_setupStep.inc        | 2 +-
 setup/class_setupStepMigrate.inc | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/setup/class_setupStep.inc b/setup/class_setupStep.inc
index bab60d15a..2554fd386 100644
--- a/setup/class_setupStep.inc
+++ b/setup/class_setupStep.inc
@@ -93,7 +93,7 @@ class setupStep extends simplePlugin
   }
 
   /* Return attributes handled by this setup step */
-  function get_attributes()
+  public function get_attributes ()
   {
     $tmp = array();
     foreach (array_keys($this->attributesAccess) as $attr) {
diff --git a/setup/class_setupStepMigrate.inc b/setup/class_setupStepMigrate.inc
index ecffb51fb..cfda33456 100644
--- a/setup/class_setupStepMigrate.inc
+++ b/setup/class_setupStepMigrate.inc
@@ -407,7 +407,7 @@ class setupStepMigrate extends setupStep
         $mods['ou'] = $val;
       }
 
-      /*Append description, it is required by gosaDepartment too */
+      /* Append description, it is required by gosaDepartment too */
       if (!isset($attrs['description'])) {
         $val = "GOsa";
         if (isset($attrs[$dep_infos['mainAttr']][0])) {
@@ -420,7 +420,7 @@ class setupStepMigrate extends setupStep
       $this->rootOC_details['target'] = $str;
       $this->rootOC_details['mods']   = $mods;
 
-      /*  Add button that allows to open the migration details */
+      /* Add button that allows to open the migration details */
       throw new CheckFailedException(
         _('Failed'),
         '&nbsp;'.$checkobj->submit()
@@ -433,6 +433,8 @@ class setupStepMigrate extends setupStep
 
   function check_baseOC_migrate (&$checkobj)
   {
+    /* Refresh $this->rootOC_details */
+    $checkobj->run();
     $this->openDialog(new StepMigrateDialog($checkobj, 'setup_migrate_baseOC.tpl', $this->rootOC_details));
   }
 
-- 
GitLab