From 40bb2d04da5b5dfe5f87f899861e6954c2004c85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Thu, 22 Aug 2019 09:44:51 +0200
Subject: [PATCH] :ambulance: fix(setup) Fix error when migrating accounts
Fixed an error about LDAP::fix being used, and a PHP error in the
template when entry['after'] is not set.
issue #2895
---
setup/class_setupStepMigrate.inc | 2 +-
setup/setup_migrate_accounts.tpl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/setup/class_setupStepMigrate.inc b/setup/class_setupStepMigrate.inc
index 503ab63b2..646201e38 100644
--- a/setup/class_setupStepMigrate.inc
+++ b/setup/class_setupStepMigrate.inc
@@ -1120,7 +1120,7 @@ class setupStepMigrate extends setupStep
$dn = base64_decode($b_dn);
$d_dn = preg_replace('/,.*$/', ','.$destination_dep, $dn);
if ($only_ldif) {
- $entry['ldif'] = _('Entry will be moved from').":<br/>\t".($ldap->fix($dn)).'<br/>'._('to').":<br/>\t".($ldap->fix($d_dn));
+ $entry['ldif'] = _('Entry will be moved from').":<br/>\t".htmlentities($dn, ENT_COMPAT, 'UTF-8').'<br/>'._('to').":<br/>\t".htmlentities($d_dn, ENT_COMPAT, 'UTF-8');
/* Check if there are references to this object */
$ldap->search('(&(member='.ldap_escape_f($dn).')(|(objectClass=gosaGroupOfNames)(objectClass=groupOfNames)))', ['dn']);
diff --git a/setup/setup_migrate_accounts.tpl b/setup/setup_migrate_accounts.tpl
index 0d2bcbeba..1bd51f855 100644
--- a/setup/setup_migrate_accounts.tpl
+++ b/setup/setup_migrate_accounts.tpl
@@ -24,7 +24,7 @@
{if $entry.checked}
<input type="checkbox" name="migrate_{$key}" checked="checked" id="migrate_{$key}"/>
<label for="migrate_{$key}">{$entry.dn}</label>
- {if $entry.after != ""}
+ {if !empty($entry.after)}
<div class="step2-entry-container-info">
{t}Current{/t}
<div style="padding-left:20px;">
--
GitLab