Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fusiondirectory
fusiondirectory
Commits
ae3b5141
Commit
ae3b5141
authored
Jan 18, 2017
by
Côme Chilliet
Browse files
Fixes
#5235
Removed references to gosaAccount from setup migrate step
parent
ed76ecf1
Changes
2
Hide whitespace changes
Inline
Side-by-side
setup/class_setupStep_Migrate.inc
View file @
ae3b5141
...
...
@@ -26,11 +26,11 @@ Step_Migrate - Constructor.
update_strings - Used to update the displayed step information.
initialize_checks - Initialize migration steps.
check_ldap_permissions - Check if the used admin account has full access to the ldap database.
check_
gosaA
ccounts - Check if there are users without the required objectClasses.
migrate_
gosaA
ccounts - Migrate selected users to FusionDirectory user accounts.
check_orgUnits - Check if there are departments, that are not visible for FusionDirectory
migrate_orgUnits - Migrate selected departments
check_adminAccount - Check if there is at least one acl entry available
check_
a
ccounts
- Check if there are users without the required objectClasses.
migrate_
a
ccounts
- Migrate selected users to FusionDirectory user accounts.
check_orgUnits
- Check if there are departments, that are not visible for FusionDirectory
migrate_orgUnits
- Migrate selected departments
check_adminAccount
- Check if there is at least one acl entry available
checkBase - Check if there is a root object available
get_user_list - Get list of available users
...
...
@@ -185,7 +185,7 @@ class Step_Migrate extends setupStep
/* Entries needing migration */
var
$orgUnits_toMigrate
=
array
();
var
$
gosaA
ccounts
_t
oMigrate
=
array
();
var
$
a
ccounts
T
oMigrate
=
array
();
var
$outsideUsers_toMigrate
=
array
();
var
$outsideGroups_toMigrate
=
array
();
...
...
@@ -257,7 +257,7 @@ class Step_Migrate extends setupStep
$checks
=
array
(
'baseOC'
=>
new
StepMigrateCheck
(
$this
,
'baseOC'
,
_
(
'Inspecting object classes in root object'
)),
'permissions'
=>
new
StepMigrateCheck
(
$this
,
'permissions'
,
_
(
'Checking permission for LDAP database'
)),
'
gosaA
ccounts'
=>
new
StepMigrateCheck
(
$this
,
'
gosaA
ccounts'
,
_
(
'Checking for invisible users'
)),
'
a
ccounts'
=>
new
StepMigrateCheck
(
$this
,
'
a
ccounts'
,
_
(
'Checking for invisible users'
)),
'adminAccount'
=>
new
StepMigrateCheck
(
$this
,
'adminAccount'
,
_
(
'Checking for super administrator'
)),
'defaultACLs'
=>
new
StepMigrateCheck
(
$this
,
'defaultACLs'
,
_
(
'Checking for default ACL roles and groups'
)),
'outsideUsers'
=>
new
StepMigrateCheck
(
$this
,
'outsideUsers'
,
_
(
'Checking for users outside the people tree'
)),
...
...
@@ -520,7 +520,7 @@ class Step_Migrate extends setupStep
/* Check if there are users which will
* be invisible for FusionDirectory
*/
function
check_
gosaA
ccounts
(
&
$checkobj
)
function
check_
a
ccounts
(
&
$checkobj
)
{
global
$config
;
$ldap
=
$config
->
get_ldap_link
();
...
...
@@ -528,8 +528,8 @@ class Step_Migrate extends setupStep
/* Remember old list of invisible users, to be able to set
* the 'html checked' status for the checkboxes again
*/
$old
=
$this
->
gosaA
ccounts
_t
oMigrate
;
$this
->
gosaA
ccounts
_t
oMigrate
=
array
();
$old
=
$this
->
a
ccounts
T
oMigrate
;
$this
->
a
ccounts
T
oMigrate
=
array
();
/* Get all invisible users */
$ldap
->
cd
(
$config
->
current
[
'BASE'
]);
...
...
@@ -556,7 +556,7 @@ class Step_Migrate extends setupStep
if
(
isset
(
$old
[
base64_encode
(
$attrs
[
'dn'
])]))
{
$attrs
[
'checked'
]
=
$old
[
base64_encode
(
$attrs
[
'dn'
])][
'checked'
];
}
$this
->
gosaA
ccounts
_t
oMigrate
[
base64_encode
(
$attrs
[
'dn'
])]
=
$attrs
;
$this
->
a
ccounts
T
oMigrate
[
base64_encode
(
$attrs
[
'dn'
])]
=
$attrs
;
}
}
...
...
@@ -565,7 +565,7 @@ class Step_Migrate extends setupStep
_
(
'LDAP query failed'
),
_
(
'Possibly the "root object" is missing.'
)
);
}
elseif
(
count
(
$this
->
gosaA
ccounts
_t
oMigrate
)
==
0
)
{
}
elseif
(
count
(
$this
->
a
ccounts
T
oMigrate
)
==
0
)
{
/* No invisible */
return
''
;
}
else
{
...
...
@@ -573,23 +573,23 @@ class Step_Migrate extends setupStep
"<div style='color:#F0A500'>"
.
_
(
"Warning"
)
.
"</div>"
,
sprintf
(
_
(
'Found %s user(s) that will not be visible in FusionDirectory or which are incomplete.'
),
count
(
$this
->
gosaA
ccounts
_t
oMigrate
)
count
(
$this
->
a
ccounts
T
oMigrate
)
)
.
$checkobj
->
submit
()
);
}
}
function
check_
gosaA
ccounts_migrate
(
&
$checkobj
)
function
check_
a
ccounts_migrate
(
&
$checkobj
)
{
$this
->
check_multipleGeneric_migrate
(
$checkobj
,
array
(
'title'
=>
_
(
'User migration'
)));
}
function
check_
gosaA
ccounts_migrate_refresh
(
&
$checkobj
)
function
check_
a
ccounts_migrate_refresh
(
&
$checkobj
)
{
return
$this
->
check_multipleGeneric_migrate_refresh
(
$checkobj
,
array
(
'title'
=>
_
(
'User migration'
)));
}
function
check_
gosaA
ccounts_migrate_confirm
(
&
$checkobj
,
$only_ldif
=
FALSE
)
function
check_
a
ccounts_migrate_confirm
(
&
$checkobj
,
$only_ldif
=
FALSE
)
{
return
$this
->
check_multipleGeneric_migrate_confirm
(
$checkobj
,
...
...
@@ -607,7 +607,7 @@ class Step_Migrate extends setupStep
foreach
(
$infos
[
'entries'
]
as
$key
=>
$data
)
{
$infos
[
'entries'
][
$key
][
'dn'
]
=
LDAP
::
fix
(
$data
[
'dn'
]);
}
$this
->
openDialog
(
new
StepMigrateDialog
(
$checkobj
,
'setup_migrate_
gosaA
ccounts.tpl'
,
$infos
));
$this
->
openDialog
(
new
StepMigrateDialog
(
$checkobj
,
'setup_migrate_
a
ccounts.tpl'
,
$infos
));
}
function
check_multipleGeneric_migrate_refresh
(
&
$checkobj
,
$infos
)
...
...
setup/setup_migrate_
gosaA
ccounts.tpl
→
setup/setup_migrate_
a
ccounts.tpl
View file @
ae3b5141
File moved
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment