Unverified Commit 37f09e4f authored by Côme Chilliet's avatar Côme Chilliet
Browse files

:ambulance: fix(setup) Fix problems in setup

Checks, LDAP base and admin creation were broken

issue #6122
Showing with 15 additions and 6 deletions
+15 -6
......@@ -26,7 +26,10 @@ class setupStepLdap extends setupStep
var $connect_id = FALSE;
var $bind_id = FALSE;
static function getAttributesInfo()
private $lastBase = '';
private $lastConnection = '';
static function getAttributesInfo ()
{
return array(
'connection' => array(
......@@ -128,17 +131,18 @@ class setupStepLdap extends setupStep
'base', TRUE
);
}
$this->lastConnection = $this->connection;
$this->lastBase = $this->base;
}
function save_object()
{
$base = $this->base;
$connection = $this->connection;
parent::save_object();
$this->connection = preg_replace("/\/$/", "", $this->connection);
if (($this->base != $base) || ($this->connection != $connection)) {
$this->connection = preg_replace('/\/$/', '', $this->connection);
if (($this->base != $this->lastBase) || ($this->connection != $this->lastConnection)) {
$this->parent->disable_steps_from(($this->parent->step_name_to_id(get_class($this))) + 1);
if ($this->connection != $connection) {
$this->lastBase = $this->base;
if ($this->connection != $this->lastConnection) {
$this->update_base_choices();
}
}
......
......@@ -104,6 +104,11 @@ class StepMigrateDialog extends GenericDialog
{
return FALSE;
}
public function getInfos ()
{
return $this->infos;
}
}
class StepMigrateCheck
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment