From 23d9e0d508e6a9a42f3b16973c0c3e2e5b9e6226 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 20 May 2010 14:58:17 +0000 Subject: [PATCH] Updated setup again git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18606 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/setup/class_setupStep_Migrate.inc | 14 +- gosa-core/setup/setup_migrate.tpl | 172 +++++++------------- 2 files changed, 62 insertions(+), 124 deletions(-) diff --git a/gosa-core/setup/class_setupStep_Migrate.inc b/gosa-core/setup/class_setupStep_Migrate.inc index 4b888535f..a761be093 100644 --- a/gosa-core/setup/class_setupStep_Migrate.inc +++ b/gosa-core/setup/class_setupStep_Migrate.inc @@ -325,8 +325,8 @@ class Step_Migrate extends setup_step $this->checks['acls']['STATUS_MSG']= _("Failed"); $this->checks['acls']['ERROR_MSG'] = $str; $this->checks['acls']['ERROR_MSG'].= _("There is no valid GOsa 2.6 administrator account inside your LDAP.")." "; - $this->checks['acls']['ERROR_MSG'].= ""; - $this->checks['acls']['ERROR_MSG'].= ""; + $this->checks['acls']['ERROR_MSG'].= ""; + $this->checks['acls']['ERROR_MSG'].= ""; }elseif($GOsa_26_found){ $str = ""; if(!empty($valid_users)){ @@ -342,7 +342,7 @@ class Step_Migrate extends setup_step $this->checks['acls']['STATUS'] = FALSE; $this->checks['acls']['STATUS_MSG']= _("Failed"); $this->checks['acls']['ERROR_MSG']= _("There is no GOsa administrator account inside your LDAP.")." "; - $this->checks['acls']['ERROR_MSG'].= ""; + $this->checks['acls']['ERROR_MSG'].= ""; } } @@ -696,7 +696,7 @@ class Step_Migrate extends setup_step $this->checks['root']['STATUS'] = FALSE; $this->checks['root']['STATUS_MSG']= _("Failed"); $this->checks['root']['ERROR_MSG'] = _("The LDAP root object is missing. It is required to use your LDAP service.").' '; - $this->checks['root']['ERROR_MSG'].= ""; + $this->checks['root']['ERROR_MSG'].= ""; return(FALSE); }else{ @@ -709,7 +709,7 @@ class Step_Migrate extends setup_step $this->checks['root']['STATUS'] = FALSE; $this->checks['root']['STATUS_MSG']= _("Failed"); $this->checks['root']['ERROR_MSG'] = _("Root object couldn't be created, you should try it on your own."); - $this->checks['root']['ERROR_MSG'].= " "; + $this->checks['root']['ERROR_MSG'].= " "; return($res);; } } @@ -836,8 +836,8 @@ class Step_Migrate extends setup_step */ $this->checks['rootOC']['STATUS'] = FALSE; $this->checks['rootOC']['STATUS_MSG']= _("Failed"); - $this->checks['rootOC']['ERROR_MSG'] = " "; + $this->checks['rootOC']['ERROR_MSG'] = " "; return(FALSE); }else{ diff --git a/gosa-core/setup/setup_migrate.tpl b/gosa-core/setup/setup_migrate.tpl index 97c326948..9f17d8ffe 100644 --- a/gosa-core/setup/setup_migrate.tpl +++ b/gosa-core/setup/setup_migrate.tpl @@ -1,137 +1,75 @@ -
-
- {if $method == "default"} -

{t}During the LDAP inspection, we're going to check for several common pitfalls that may occur when migration to GOsa base LDAP administration. You may want to fix the problems below, in order to provide smooth services.{/t} -

- - {foreach from=$checks item=val key=key} -
- - {if $checks.$key.ERROR_MSG} - -
- {else} - -
- {/if} -
{$checks.$key.TITLE}
-
- {if $checks.$key.STATUS} -
{$checks.$key.STATUS_MSG}
- {else} -
{$checks.$key.STATUS_MSG}
- {/if} -
- {if $checks.$key.ERROR_MSG} - {$checks.$key.ERROR_MSG} - {/if} -
-
- {/foreach} +

{t}During the LDAP inspection, we're going to check for several common pitfalls that may occur when migration to GOsa base LDAP administration. You may want to fix the problems below, in order to provide smooth services.{/t} +

+ + + {foreach from=$checks item=val key=key} + + + + {/foreach} +
+ {$checks.$key.TITLE}  {$checks.$key.STATUS_MSG} +

+ {if $checks.$key.ERROR_MSG} + {$checks.$key.ERROR_MSG} + {/if} +

+

- - {elseif $method == "rootOC_migrate_dialog"} + {elseif $method == "rootOC_migrate_dialog"}

{t}Add required object classes to the LDAP base{/t}

{t}Current{/t} -
-
- 
{$details.current}
-
-
+ 
{$details.current}
+
{t}After migration{/t} -
-
- 
{$details.target}
-
-
+ 
{$details.target}

- -

- -
-
+
-
{elseif $method == "create_acls"} - {if $acl_create_selected != "" && $what_will_be_done_now!=""} -
-
-{$what_will_be_done_now}
-
-
- - - - - {else} -

{t}Create a new GOsa administrator account{/t}

- -

- {t}This dialog will automatically add a new super administrator to your LDAP tree.{/t} -

- - - - - - - - - - - - - - - - - -
- {t}Name{/t}:  - - System administrator -
- {t}User ID{/t}:  - -
-
- {t}Password{/t}:  - -
-
- {t}Password (again){/t}:  - - -
-
- - - - -
-
- - - - -
- {/if} - {/if} +

{t}Create a new GOsa administrator account{/t}

+

{t}This dialog will automatically add a new super administrator to your LDAP tree.{/t}

+ + + + + + + + + + + + + + + + + + +
{t}Name{/t}:System administrator
{t}User ID{/t}: 
{t}Password{/t}: 
{t}Password (again){/t}: 
+ + + +
+
+ +
-
+{/if} -- 2.30.2