From 4b5b4f6beb51239fb7d9e72ab76453750840013d Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Sun, 20 Mar 2011 23:32:41 +0100
Subject: [PATCH] first cleanup of setup should close 117, 122
---
setup/class_setupStep.inc | 2 +-
setup/class_setupStep_Checks.inc | 28 ++++++++++++------------
setup/class_setupStep_Config1.inc | 6 +++---
setup/class_setupStep_Config2.inc | 6 +++---
setup/class_setupStep_Config3.inc | 18 ++++++++--------
setup/class_setupStep_Feedback.inc | 2 +-
setup/class_setupStep_Finish.inc | 2 +-
setup/class_setupStep_Ldap.inc | 2 +-
setup/class_setupStep_Migrate.inc | 34 +++++++++++++++---------------
setup/setup_checks.tpl | 8 +++----
setup/setup_config1.tpl | 8 +++----
setup/setup_config2.tpl | 4 ++--
setup/setup_config3.tpl | 34 +++++++++++++++---------------
setup/setup_feedback.tpl | 19 +++++++----------
setup/setup_frame.tpl | 4 ++--
setup/setup_ldap.tpl | 2 +-
setup/setup_migrate.tpl | 22 +++++++++----------
setup/setup_schema.tpl | 2 +-
setup/setup_welcome.tpl | 2 +-
19 files changed, 101 insertions(+), 104 deletions(-)
diff --git a/setup/class_setupStep.inc b/setup/class_setupStep.inc
index 33bc66369..24b0cc4b4 100644
--- a/setup/class_setupStep.inc
+++ b/setup/class_setupStep.inc
@@ -24,7 +24,7 @@ class setup_step extends plugin
{
var $s_title = "Still undefined";
var $s_title_long = "This is a still undefined long title";
- var $s_info = "This info is still undefined. This setup step detect the type of your ldap. for gosa.This is a basic requirement for fusiondirectory.";
+ var $s_info = "This info is still undefined. This setup step detect the type of your ldap for FusionDirectory.This is a basic requirement for fusiondirectory.";
var $is_active = false;
var $is_enabled = false;
var $is_completed = false;
diff --git a/setup/class_setupStep_Checks.inc b/setup/class_setupStep_Checks.inc
index 74c0f29e2..ce7521807 100644
--- a/setup/class_setupStep_Checks.inc
+++ b/setup/class_setupStep_Checks.inc
@@ -70,7 +70,7 @@ class Step_Checks extends setup_step
/* Checking imap extension */
$N = msgPool::checkingFor("LDAP");
- $D = _("GOsa requires this module to talk with your LDAP server.");
+ $D = _("FusionDirectory requires this module to talk with your LDAP server.");
$S = msgPool::installPhpModule("LDAP");
$R = is_callable("ldap_bind");
$M = TRUE;
@@ -78,7 +78,7 @@ class Step_Checks extends setup_step
/* Check for gettext support */
$N = msgPool::checkingFor("gettext");
- $D = _("GOsa requires this module for an internationalized interface.");
+ $D = _("FusionDirectory requires this module for an internationalized interface.");
$S = msgPool::installPhpModule("gettext");
$R = is_callable("bindtextdomain");
$M = TRUE;
@@ -86,7 +86,7 @@ class Step_Checks extends setup_step
/* Checing for iconv */
$N = msgPool::checkingFor("inconv");
- $D = _("GOsa requires this module for the samba integration.");
+ $D = _("FusionDirectory requires this module for the samba integration.");
$S = msgPool::installPhpModule("iconv");
$R = is_callable("iconv");
$M = TRUE;
@@ -94,7 +94,7 @@ class Step_Checks extends setup_step
/* Check for installed mhash module */
$N = msgPool::checkingFor("hash method");
- $D = _("GOsa requires either 'mhash' or the 'sha1' module to make use of SSHA encryption.");
+ $D = _("FusionDirectory requires either 'mhash' or the 'sha1' module to make use of SSHA encryption.");
$S = msgPool::installPhpModule("mhash/sha1");
$R = is_callable('mhash') || is_callable('sha1');
$M = FALSE;
@@ -102,7 +102,7 @@ class Step_Checks extends setup_step
/* Is imap module available */
$N = msgPool::checkingFor("IMAP");
- $D = _("GOsa requires this module to talk to an IMAP server.");
+ $D = _("FusionDirectory requires this module to talk to an IMAP server.");
$S = msgPool::installPhpModule("IMAP");
$R = is_callable("imap_open");
$M = TRUE;
@@ -110,7 +110,7 @@ class Step_Checks extends setup_step
/* Is imap module available */
$N = msgPool::checkingFor(_("mbstring"));
- $D = _("GOsa requires this module to handle unicode strings.");
+ $D = _("FusionDirectory requires this module to handle unicode strings.");
$S = msgPool::installPhpModule("mbstring");
$R = is_callable("mb_strlen");
$M = TRUE;
@@ -118,7 +118,7 @@ class Step_Checks extends setup_step
/* Mysql module loaded ? */
$N = msgPool::checkingFor(_("MySQL"));
- $D = _("GOsa requires this module to communicate with several supported databases.");
+ $D = _("FusionDirectory requires this module to communicate with several supported databases.");
$S = msgPool::installPhpModule("MySQL");
$R = is_callable("mysql_query");
$M = TRUE;
@@ -136,7 +136,7 @@ class Step_Checks extends setup_step
}
$N = msgPool::checkingFor(_("samba hash generator"));
- $D = _("GOsa requires this command to synchronize POSIX and samba passwords.");
+ $D = _("FusionDirectory requires this command to synchronize POSIX and samba passwords.");
$S = _("Deploy a goto-si installation or install the perl Crypt::SmbHash modules.");
$R = $have_mkntpwd;
$M = TRUE;
@@ -151,7 +151,7 @@ class Step_Checks extends setup_step
pclose($sh);
$N = msgPool::checkingFor(_("imagick"));
- $D = _("GOsa requires this extension to handle images.");
+ $D = _("FusionDirectory requires this extension to handle images.");
$S = msgPool::installPhpModule("php5-imagick");
$IMGVER = phpversion('imagick');
@@ -167,7 +167,7 @@ class Step_Checks extends setup_step
$this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M );
$N = msgPool::checkingFor(_("compression module"));
- $D = _("GOsa requires this extension to handle snapshots.");
+ $D = _("FusionDirectory requires this extension to handle snapshots.");
$S = msgPool::installPhpModule("compile with --with-zlib");
$R = is_callable("gzcompress");
$M = FALSE;
@@ -197,7 +197,7 @@ class Step_Checks extends setup_step
/* Session auto start must be turned off */
$session_auto_start = ini_get('session.auto_start');
$N = "session.auto_start = <b>"._("Off")."</b>";
- $D = _("In Order to use GOsa without any trouble, the session.auto_register option in your php.ini should be set to 'Off'.");
+ $D = _("In Order to use FusionDirectory without any trouble, the session.auto_register option in your php.ini should be set to 'Off'.");
$S = _("Search for 'session.auto_start' in your php.ini and set it to 'Off'.");
$R = !$session_auto_start['local_value'];
$M = TRUE;
@@ -205,7 +205,7 @@ class Step_Checks extends setup_step
/* Check if memory limit is set to 32 or > */
$N = "memory_limit >= <b>32</b>";
- $D = _("GOsa needs at least 32MB of memory. Setting it below this limit may cause errors that are not reproducable! Increase it for larger setups.");
+ $D = _("FusionDirectory needs at least 32MB of memory. Setting it below this limit may cause errors that are not reproducable! Increase it for larger setups.");
$S = _("Search for 'memory_limit' in your php.ini and set it to '32M' or higher.");
$R = ini_get('memory_limit') >= 32 ;
$M = TRUE;
@@ -258,7 +258,7 @@ class Step_Checks extends setup_step
/* Check if we can create a config file.*/
$N = _("Configuration writeable");
$D = _("The configuration file can't be written");
- $S = sprintf(_("GOsa reads its configuration from a file located in (%s/%s). The setup can write the configuration directly if it is writeable."),CONFIG_DIR,CONFIG_FILE);
+ $S = sprintf(_("FusionDirectory reads its configuration from a file located in (%s/%s). The setup can write the configuration directly if it is writeable."),CONFIG_DIR,CONFIG_FILE);
$R = ( file_exists(CONFIG_DIR."/".CONFIG_FILE) && is_writeable(CONFIG_DIR."/".CONFIG_FILE)) // is there a config file ?
|| (!file_exists(CONFIG_DIR."/".CONFIG_FILE) && is_writeable(CONFIG_DIR)); // There is non, but can we create a file there ?
$M = FALSE;
@@ -287,7 +287,7 @@ class Step_Checks extends setup_step
/* Check if current PHP version is compatible
- with the current version of GOsa */
+ with the current version of FusionDirectory */
function check_php_version()
{
return(version_compare(phpversion(),"5.2.0",">="));
diff --git a/setup/class_setupStep_Config1.inc b/setup/class_setupStep_Config1.inc
index 5b6f0a5f1..a7e345615 100644
--- a/setup/class_setupStep_Config1.inc
+++ b/setup/class_setupStep_Config1.inc
@@ -71,9 +71,9 @@ class Step_Config1 extends setup_step
function update_strings()
{
- $this->s_title = _("GOsa settings 1/3");
- $this->s_title_long = _("GOsa settings 1/3");
- $this->s_info = _("GOsa generic settings");
+ $this->s_title = _("FusionDirectory settings 1/3");
+ $this->s_title_long = _("FusionDirectory settings 1/3");
+ $this->s_info = _("FusionDirectory generic settings");
}
diff --git a/setup/class_setupStep_Config2.inc b/setup/class_setupStep_Config2.inc
index a23e72319..56f762cfe 100644
--- a/setup/class_setupStep_Config2.inc
+++ b/setup/class_setupStep_Config2.inc
@@ -31,7 +31,7 @@ class Step_Config2 extends setup_step
var $mail = "none";
var $mail_attrib = "";
var $mail_methods = array();
- var $mail_settings = array("vacationdir" => "/etc/gosa/vacation",
+ var $mail_settings = array("vacationdir" => "/etc/fusiondirectory/vacation",
"vacationdir_active" => FALSE);
var $generic_settings = array( "enableCopyPaste" => false,
@@ -78,8 +78,8 @@ class Step_Config2 extends setup_step
function update_strings()
{
- $this->s_title = _("GOsa settings 2/3");
- $this->s_title_long = _("GOsa settings 2/3");
+ $this->s_title = _("FusionDirectory settings 2/3");
+ $this->s_title_long = _("FusionDirectory settings 2/3");
$this->s_info = _("Customize special parameters");
}
diff --git a/setup/class_setupStep_Config3.inc b/setup/class_setupStep_Config3.inc
index 901329d44..fa4fbf5c2 100644
--- a/setup/class_setupStep_Config3.inc
+++ b/setup/class_setupStep_Config3.inc
@@ -54,9 +54,9 @@ class Step_Config3 extends setup_step
"notifydir" => "",
"notifydir_active" => FALSE,
- "gosaSupportURI" => "gosa-si-secret@server:20081",
- "gosaSupportTimeout" => 15,
- "gosaSupportURI_active" => FALSE,
+ "goto-si-URI" => "goto-si-secret@server:20081",
+ "goto-si-Timeout" => 15,
+ "goto-si-URI_active" => FALSE,
"uniq_identifier" => "entryCSN",
"uniq_identifier_active" => TRUE,
@@ -176,14 +176,14 @@ class Step_Config3 extends setup_step
$this->optional['notifydir_active'] = FALSE;
}
- if(isset($_POST['gosaSupportURI_active'])){
- $this->optional['gosaSupportURI_active'] = TRUE;
- if(isset($_POST['gosaSupportURI'])){
- $this->optional['gosaSupportURI'] = get_post('gosaSupportURI');
- $this->optional['gosaSupportTimeout'] = get_post('gosaSupportTimeout');
+ if(isset($_POST['goto-si-URI_active'])){
+ $this->optional['goto-si-URI_active'] = TRUE;
+ if(isset($_POST['goto-si-URI'])){
+ $this->optional['goto-si-URI'] = get_post('goto-si-URI');
+ $this->optional['goto-si-Timeout'] = get_post('goto-si-Timeout');
}
}else{
- $this->optional['gosaSupportURI_active'] = FALSE;
+ $this->optional['goto-si-URI_active'] = FALSE;
}
if(isset($_POST['uniq_identifier_active'])){
diff --git a/setup/class_setupStep_Feedback.inc b/setup/class_setupStep_Feedback.inc
index 22931e2ed..bc618f3a3 100644
--- a/setup/class_setupStep_Feedback.inc
+++ b/setup/class_setupStep_Feedback.inc
@@ -249,7 +249,7 @@ class Step_Feedback extends setup_step
}else{
$str .= "\nFirst use: FALSE";
}
- $str .= "\nUsing GOsa since: ".$this->use_since;
+ $str .= "\nUsing FusionDirectory since: ".$this->use_since;
$str .="\nDistribution: ".$this->distribution;
$str .="\nWeb Server: ".$this->web_server;
diff --git a/setup/class_setupStep_Finish.inc b/setup/class_setupStep_Finish.inc
index f3dfa3410..cebb2edde 100644
--- a/setup/class_setupStep_Finish.inc
+++ b/setup/class_setupStep_Finish.inc
@@ -64,7 +64,7 @@ class Step_Finish extends setup_step
*/
$exists = file_exists(CONFIG_DIR."/".CONFIG_FILE);
- /* Redirect to GOsa login, if :
+ /* Redirect to FusionDirectory login, if :
* - fusiondirectory.conf exists
* - Permisssion are set correctly
*/
diff --git a/setup/class_setupStep_Ldap.inc b/setup/class_setupStep_Ldap.inc
index 46717f9e3..9f4abc2c0 100644
--- a/setup/class_setupStep_Ldap.inc
+++ b/setup/class_setupStep_Ldap.inc
@@ -52,7 +52,7 @@ class Step_Ldap extends setup_step
{
$this->s_title = _("LDAP setup");
$this->s_title_long = _("LDAP connection setup");
- $this->s_info = _("This dialog performs the basic configuration of the LDAP connectivity for GOsa.");
+ $this->s_info = _("This dialog performs the basic configuration of the LDAP connectivity for FusionDirectory.");
}
diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index e392d434b..a7ec585b7 100644
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -28,8 +28,8 @@ update_strings - Used to update the displayed step informations.
initialize_checks - Initialize migration steps.
check_ldap_permissions - Check if the used admin account has full access to the ldap database.
check_gosaAccounts - Check if there are users without the required objectClasses.
-migrate_gosaAccounts - Migrate selected users to GOsa user accounts.
-check_organizationalUnits - Check if there are departments, that are not visible for GOsa
+migrate_gosaAccounts - Migrate selected users to FusionDirectory user accounts.
+check_organizationalUnits - Check if there are departments, that are not visible for FusionDirectory
migrate_organizationalUnits - Migrate selected departments
check_administrativeAccount - Check if there is at least one acl entry available
checkBase - Check if there is a root object available
@@ -125,7 +125,7 @@ class Step_Migrate extends setup_step
{
$this->s_title = _("LDAP inspection");
$this->s_title_long = _("LDAP inspection");
- $this->s_info = _("Analyze your current LDAP for GOsa compatibility");
+ $this->s_info = _("Analyze your current LDAP for FusionDirectory compatibility");
}
function initialize_checks()
@@ -557,7 +557,7 @@ class Step_Migrate extends setup_step
$testEntry['objectClass'][]= "top";
$testEntry['objectClass'][]= "organizationalUnit";
$testEntry['objectClass'][]= "gosaDepartment";
- $testEntry['description']= "Created by GOsa setup, this object can be removed.";
+ $testEntry['description']= "Created by FusionDirectory setup, this object can be removed.";
$testEntry['ou'] = $name;
/* check if simple ldap cat will be successful
@@ -607,7 +607,7 @@ class Step_Migrate extends setup_step
/* Check if there are users which will
- * be invisible for GOsa
+ * be invisible for FusionDirectory
*/
function check_gosaAccounts()
{
@@ -658,7 +658,7 @@ class Step_Migrate extends setup_step
}else{
$this->checks['users_visible']['STATUS'] = FALSE;
$this->checks['users_visible']['STATUS_MSG']= "<font style='color:#F0A500'>"._("Warning")."</font>";
- $this->checks['users_visible']['ERROR_MSG'] = sprintf(_("Found %s user(s) that will not be visible in GOsa."),
+ $this->checks['users_visible']['ERROR_MSG'] = sprintf(_("Found %s user(s) that will not be visible in FusionDirectory."),
count($this->users_to_migrate));
$this->checks['users_visible']['ERROR_MSG'] .= "<input type='submit' name='users_visible_migrate' value='"._("Migrate")."...'>";
}
@@ -736,7 +736,7 @@ class Step_Migrate extends setup_step
$ldap = new ldapMultiplexer($ldap_l);
- /* Skip GOsa internal departments */
+ /* Skip FusionDirectory internal departments */
$skip_dns = array("/".$cv['peopleou']."/","/".$cv['groupou']."/","/^ou=people,/","/^ou=groups,/","/^ou=sudoers,/",
"/(,|)ou=configs,/","/(,|)ou=systems,/",
"/(,|)ou=apps,/","/(,|)ou=mime,/","/(,|)ou=devices/","/^ou=aclroles,/","/^ou=incoming,/",
@@ -761,7 +761,7 @@ class Step_Migrate extends setup_step
}
/* Filter returned list of departments and ensure that
- * GOsa internal departments will not be listed
+ * FusionDirectory internal departments will not be listed
*/
foreach($this->deps_to_migrate as $key => $attrs){
$dn = $attrs['dn'];
@@ -801,7 +801,7 @@ class Step_Migrate extends setup_step
}else{
$this->checks['deps_visible']['STATUS'] = TRUE;
$this->checks['deps_visible']['STATUS_MSG']= '<font style="color:#FFA500">'._("Warning").'</font>';
- $this->checks['deps_visible']['ERROR_MSG'] = sprintf(_("Found %s department(s) that will not be visible in GOsa."),count($this->deps_to_migrate));
+ $this->checks['deps_visible']['ERROR_MSG'] = sprintf(_("Found %s department(s) that will not be visible in FusionDirectory."),count($this->deps_to_migrate));
$this->checks['deps_visible']['ERROR_MSG'] .= " <input type='submit' name='deps_visible_migrate' value='"._("Migrate")."...'>";
}
}
@@ -897,7 +897,7 @@ class Step_Migrate extends setup_step
$username = "";
$attrs = $ldap->fetch();
- /* Collect a list of available GOsa users and groups
+ /* Collect a list of available FusionDirectory users and groups
*/
$users = array();
$ldap->search("(&(objectClass=gosaAccount)(objectClass=person)".
@@ -912,7 +912,7 @@ class Step_Migrate extends setup_step
$groups[$group_attrs['dn']] = $group_attrs['cn'][0];
}
- /* Check if a valid GOsa 2.6 admin exists
+ /* Check if a valid FusionDirectory 1.0 admin exists
-> gosaAclEntry for an existing and accessible user.
*/
$valid_users = "";
@@ -954,7 +954,7 @@ class Step_Migrate extends setup_step
}
}elseif($tmp[1] == "role"){
- /* Check if acl owner is a valid GOsa user account */
+ /* Check if acl owner is a valid FusionDirectory user account */
$ldap->cat(base64_decode($tmp[2]),array("gosaAclTemplate"));
$ret = $ldap->fetch();
@@ -997,7 +997,7 @@ class Step_Migrate extends setup_step
}
}
- /* Try to find an old GOsa 2.5 administrative account that may be migrated
+ /* Try to find an old FusionDirectory 2.5 administrative account that may be migrated
*/
if(!$GOsa_26_found){
$valid_users = "";
@@ -1025,12 +1025,12 @@ class Step_Migrate extends setup_step
if($GOsa_25_found){
$str = "";
if(!empty($valid_groups)){
- $str.= "<i>".sprintf(_("GOsa 2.5 administrative accounts found: %s"),trim($valid_groups,", "))."</i><br>";
+ $str.= "<i>".sprintf(_("FusionDirectory 2.5 administrative accounts found: %s"),trim($valid_groups,", "))."</i><br>";
}
$this->checks['acls']['STATUS'] = FALSE;
$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'].= _("There is no valid FusionDirectory 1.0 administrator account inside your LDAP.")." ";
$this->checks['acls']['ERROR_MSG'].= "<input type='submit' name='migrate_acls' value='"._("Migrate")."'>";
$this->checks['acls']['ERROR_MSG'].= "<input type='submit' name='create_acls' value='"._("Create")."'>";
}elseif($GOsa_26_found){
@@ -1047,7 +1047,7 @@ class Step_Migrate extends setup_step
}else{
$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']= _("There is no FusionDirectory administrator account inside your LDAP.")." ";
$this->checks['acls']['ERROR_MSG'].= "<input type='submit' name='create_acls' value='"._("Create")."'>";
}
}
@@ -2082,7 +2082,7 @@ class Step_Migrate extends setup_step
}
/* Create 'current' and 'target' object properties, to be able to display
- * a set of modifications required to create a valid GOsa department.
+ * a set of modifications required to create a valid FusionDirectory department.
*/
$str = "dn: ".$cv['base']."\n";
for($i = 0 ; $i<$attrs['objectClass']['count'];$i++){
diff --git a/setup/setup_checks.tpl b/setup/setup_checks.tpl
index 90275fc27..eb9f4106d 100644
--- a/setup/setup_checks.tpl
+++ b/setup/setup_checks.tpl
@@ -38,11 +38,11 @@
{if $basic[$key].MUST}
<div class='step2_failed_text' style="background-image: url('images/small_error.png')">
{$basic[$key].SOLUTION}
- <b>{t}GOsa will NOT run without fixing this.{/t}</b>
+ <b>{t}FusionDirectory will NOT run without fixing this.{/t}</b>
{else}
<div class="step2_warning_text" style="background-image: url('images/small_warning.png')">
{$basic[$key].SOLUTION}
- <b>{t}GOsa will run without fixing this.{/t}</b>
+ <b>{t}FusionDirectory will run without fixing this.{/t}</b>
{/if}
</div>
</div>
@@ -100,11 +100,11 @@
{if $config[$key].MUST}
<div class='step2_failed_text' style="background-image: url('images/small_error.png')">
{$config[$key].SOLUTION}
- <b>{t}GOsa will NOT run without fixing this.{/t}</b>
+ <b>{t}FusionDirectory will NOT run without fixing this.{/t}</b>
{else}
<div class='step2_warning_text' style="background-image: url('images/small_warning.png')">
{$config[$key].SOLUTION}
- <b>{t}GOsa will run without fixing this.{/t}</b>
+ <b>{t}FusionDirectory will run without fixing this.{/t}</b>
{/if}
</div>
</div>
diff --git a/setup/setup_config1.tpl b/setup/setup_config1.tpl
index d3f1b844c..d33430019 100644
--- a/setup/setup_config1.tpl
+++ b/setup/setup_config1.tpl
@@ -218,8 +218,8 @@
<input type='hidden' value='1' name='step5_posted'>
<!--
- {t}GOsa supports several encryption types for your passwords. Normally this is adjustable via user templates, but you can specify a default method to be used here, too.{/t}
- {t}GOsa always acts as admin and manages access rights internally. This is a workaround till OpenLDAP's in directory ACI's are fully implemented. For this to work, we need the admin DN and the corresponding password.{/t}
- {t}Some basic LDAP parameters are tunable and affect the locations where GOsa saves people and groups, including the way accounts get created. Check the values below if the fit your needs.{/t}
- {t}GOsa has modular support for several mail methods. These methods provide interfaces to users mailboxes and general handling for quotas. You can choose the dummy plugin to leave all your mail settings untouched.{/t}-->
+ {t}FusionDirectory supports several encryption types for your passwords. Normally this is adjustable via user templates, but you can specify a default method to be used here, too.{/t}
+ {t}FusionDirectory always acts as admin and manages access rights internally. This is a workaround till OpenLDAP's in directory ACI's are fully implemented. For this to work, we need the admin DN and the corresponding password.{/t}
+ {t}Some basic LDAP parameters are tunable and affect the locations where FusionDirectory saves people and groups, including the way accounts get created. Check the values below if the fit your needs.{/t}
+ {t}FusionDirectory has modular support for several mail methods. These methods provide interfaces to users mailboxes and general handling for quotas. You can choose the dummy plugin to leave all your mail settings untouched.{/t}-->
diff --git a/setup/setup_config2.tpl b/setup/setup_config2.tpl
index 1cf915a17..f412348df 100644
--- a/setup/setup_config2.tpl
+++ b/setup/setup_config2.tpl
@@ -93,7 +93,7 @@
</div>
- <p><b>{t}Additional GOsa settings{/t}</b></p>
+ <p><b>{t}Additional FusionDirectory settings{/t}</b></p>
<div class='step4_container'>
<div class='step4_name'>
@@ -120,7 +120,7 @@
<div class='step4_container'>
<div class='step4_name'>
- {t}GOsa logging{/t}
+ {t}FusionDirectory logging{/t}
</div>
<div class='step4_value'>
{if $logging}
diff --git a/setup/setup_config3.tpl b/setup/setup_config3.tpl
index 1dfa10d27..daf9e5249 100644
--- a/setup/setup_config3.tpl
+++ b/setup/setup_config3.tpl
@@ -1,5 +1,5 @@
<div class='default' style='margin:12px; '>
- <p><b>{t}GOsa core settings{/t}</b></p>
+ <p><b>{t}FusionDirectory core settings{/t}</b></p>
<div class='step4_container'>
<div class='step4_name'>
@@ -171,34 +171,34 @@
<div class='step4_container'>
<div class='step4_name'>
- {t}Gosa support daemon{/t}
+ {t}GOto-SI daemon{/t}
</div>
<div class='step4_value'>
- {if $optional.gosaSupportURI_active == FALSE}
- <input type='checkbox' value='1' name='gosaSupportURI_active'
- onClick='changeState("gosaSupportURI");changeState("gosaSupportTimeout");'>
- <input size=40 id='gosaSupportURI' name='gosaSupportURI'
- type='text' value='{$optional.gosaSupportURI}' disabled>
+ {if $optional.goto-si-URI_active == FALSE}
+ <input type='checkbox' value='1' name='goto-si-URI_active'
+ onClick='changeState("goto-si-URI");changeState("goto-si-Timeout");'>
+ <input size=40 id='goto-si-URI' name='goto-si-URI'
+ type='text' value='{$optional.goto-si-URI}' disabled>
{else}
- <input type='checkbox' value='1' name='gosaSupportURI_active' checked
- onClick='changeState("gosaSupportURI");changeState("gosaSupportTimeout");'>
- <input size=40 id='gosaSupportURI' name='gosaSupportURI'
- type='text' value='{$optional.gosaSupportURI}' >
+ <input type='checkbox' value='1' name='goto-si-URI_active' checked
+ onClick='changeState("goto-si-URI");changeState("goto-si-Timeout");'>
+ <input size=40 id='goto-si-URI' name='goto-si-URI'
+ type='text' value='{$optional.goto-si-URI}' >
{/if}
</div>
</div>
<div class='step4_container'>
<div class='step4_name'>
- {t}Daemon timeout{/t}
+ {t}GOto-si daemon timeout{/t}
</div>
<div class='step4_value'>
- {if $optional.gosaSupportURI_active == FALSE}
- <input size=40 id='gosaSupportTimeout' name='gosaSupportTimeout'
- type='text' value='{$optional.gosaSupportTimeout}' disabled>
+ {if $optional.goto-si-URI_active == FALSE}
+ <input size=40 id='goto-si-Timeout' name='goto-si-Timeout'
+ type='text' value='{$optional.goto-si-Timeout}' disabled>
{else}
- <input size=40 id='gosaSupportTimeout' name='gosaSupportTimeout'
- type='text' value='{$optional.gosaSupportTimeout}' >
+ <input size=40 id='goto-si-Timeout' name='goto-si-Timeout'
+ type='text' value='{$optional.goto-si-Timeout}' >
{/if}
</div>
</div>
diff --git a/setup/setup_feedback.tpl b/setup/setup_feedback.tpl
index 453760c19..bbb63d512 100644
--- a/setup/setup_feedback.tpl
+++ b/setup/setup_feedback.tpl
@@ -12,11 +12,8 @@
<h2>{$additional_info}</h2>
<h2>
- <input {if $subscribe} checked {/if} type='checkbox' name='subscribe' value='1' class='center'> {t}Subscribe to the gosa-announce mailinglist{/t}
+ <input {if $subscribe} checked {/if} type='checkbox' name='subscribe' value='1' class='center'> {t}Subscribe to the fusiondirectory-users mailinglist{/t}
</h2>
- <p>
- {t}When checking this option, GOsa will try to connect http://oss.gonicus.de in order to subscribe you to the gosa-announce mailing list. You've to confirm this by mail.{/t}
- </p>
<table>
<tr>
<td>
@@ -47,10 +44,10 @@
<p> </p>
<h2>
- <input {if $use_gosa_announce} checked {/if} type='checkbox' name='use_gosa_announce' value='1' class='center'> {t}Send feedback to the GOsa project team{/t}
+ <input {if $use_gosa_announce} checked {/if} type='checkbox' name='use_gosa_announce' value='1' class='center'> {t}Send feedback to the FusionDirectory project team{/t}
</h2>
<p>
- {t}When checking this option, GOsa will try to connect http://oss.gonicus.de in order to submit your form anonymously.{/t}
+ {t}When checking this option, FusionDirectory will try to connect http://oss.gonicus.de in order to submit your form anonymously.{/t}
</p>
<b>{t}Generic{/t}</b>
<table>
@@ -74,14 +71,14 @@
</tr>
<tr>
<td style='vertical-align:top'>
- {t}Is this the first time you use GOsa?{/t}
+ {t}Is this the first time you use FusionDirectory?{/t}
</td>
<td>
<input {if $first_use} checked {/if} type='radio' name='first_use' value='1'>{t}Yes{/t}
<br>
<input {if !$first_use} checked {/if} type='radio' name='first_use' value='0'>{t}No{/t},
{t}I use it since{/t}
- <select name='use_since' title='{t}Select the year since when you are using GOsa{/t}'>
+ <select name='use_since' title='{t}Select the year since when you are using FusionDirectory{/t}'>
{html_options options=$years}
</select>
</td>
@@ -112,7 +109,7 @@
</tr>
<tr>
<td style='vertical-align:top'>
- {t}GOsa version{/t}</td>
+ {t}FusionDirectory version{/t}</td>
</td>
<td>
{$gosa_version}
@@ -140,7 +137,7 @@
<br><b>{t}Features{/t}</b>
<table>
<tr>
- <td style='vertical-align:top'>{t}What features of GOsa do you use?{/t}
+ <td style='vertical-align:top'>{t}What features of FusionDirectory do you use?{/t}
</td>
<td>
{foreach from=$features_used item=data key=key}
@@ -150,7 +147,7 @@
</td>
</tr>
<tr>
- <td style="vertical-align:top">{t}What features do you want to see in future versions of GOsa?{/t}
+ <td style="vertical-align:top">{t}What features do you want to see in future versions of FusionDirectory?{/t}
</td>
<td><textarea name='want_to_see_next' cols=50 rows=3>{$want_to_see_next}</textarea>
</td>
diff --git a/setup/setup_frame.tpl b/setup/setup_frame.tpl
index f6554f514..0b9f6f3fd 100644
--- a/setup/setup_frame.tpl
+++ b/setup/setup_frame.tpl
@@ -5,11 +5,11 @@
<input id='focus' name='focus' type='image' src='images/empty.png' style='width:0px; height:0px;' >
<div class='setup_dialog'>
<div class='setup_header'>
- <div style="float:left;"><img src='themes/default/images/go_logo.png' class='center' alt='GOsa'></div>
+ <div style="float:left;"><img src='themes/default/images/go_logo.png' class='center' alt='FusionDirectory'></div>
<div style="padding-top:8px;text-align:right;height:28px">{$version}</div>
</div>
<div class='setup_menu'>
- <b>{t}GOsa setup wizard{/t}</b>
+ <b>{t}FusionDirectory setup wizard{/t}</b>
</div>
<div style="padding:10px;background-color:white;">
diff --git a/setup/setup_ldap.tpl b/setup/setup_ldap.tpl
index 575769076..b1732d80e 100644
--- a/setup/setup_ldap.tpl
+++ b/setup/setup_ldap.tpl
@@ -4,7 +4,7 @@
<div style='float:left; width:99%; margin-bottom:20px;'>
<p>
- <b>{t}Please choose the LDAP user to be used by GOsa{/t}</b>
+ <b>{t}Please choose the LDAP user to be used by FusionDirectory{/t}</b>
</p>
<select name='admin_to_use' size=20 style="width:100%; margin-bottom:10px;">
{html_options options=$resolved_users selected=$admin}
diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl
index 456387918..45fdc5e42 100644
--- a/setup/setup_migrate.tpl
+++ b/setup/setup_migrate.tpl
@@ -2,7 +2,7 @@
<div class='default'>
{if $method == "default"}
- <p>{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}
+ <p>{t}During the LDAP inspection, we're going to check for several common pitfalls that may occur when migration to FusionDirectory base LDAP administration. You may want to fix the problems below, in order to provide smooth services.{/t}
</p>
{foreach from=$checks item=val key=key}
@@ -92,7 +92,7 @@
<input type='checkbox' id='toggle_calue' onClick="toggle_all_('^select_winstation_','toggle_calue')">
{t}Select all{/t}
<p>
- <b>{t}Move selected windows workstations into the following GOsa department{/t} : </b>
+ <b>{t}Move selected windows workstations into the following FusionDirectory department{/t} : </b>
<select name='move_winstation_to'>
{html_options options=$ous}
</select>
@@ -116,7 +116,7 @@
{t}This dialog allows moving a couple of groups to the configured group tree. Doing this may straighten your LDAP service.{/t}
</p>
<p style='color:red'>
- {t}Be careful with this option! There may be references pointing to these groups. The GOsa setup can't migrate references, so you may want to cancel the migration in this case.{/t}
+ {t}Be careful with this option! There may be references pointing to these groups. The FusionDirectory setup can't migrate references, so you may want to cancel the migration in this case.{/t}
</p>
<p>
{t}Move selected groups into this group tree{/t}:
@@ -170,7 +170,7 @@
{t}This dialog allows moving a couple of users to the configured user tree. Doing this may straighten your LDAP service.{/t}
</p>
<p style='color:red'>
- {t}Be careful with this option! There may be references pointing to these users. The GOsa setup can't migrate references, so you may want to cancel the migration in this case.{/t}
+ {t}Be careful with this option! There may be references pointing to these users. The FusionDirectory setup can't migrate references, so you may want to cancel the migration in this case.{/t}
</p>
<p>
{t}Move selected users into this people tree{/t}:
@@ -218,7 +218,7 @@
{elseif $method == "migrate_acls"}
<h2>{t}Migrate GOsa 2.5 administrative accounts{/t}</h2>
<p>
- {t}This dialog allows the migration of GOsa 2.5 admin accounts into GOsa 2.6 useable accounts.{/t}
+ {t}This dialog allows the migration of GOsa 2.5 admin accounts into FusionDirectory 1.0 useable accounts.{/t}
</p>
<table>
<tr>
@@ -272,7 +272,7 @@
<input type='submit' name='create_acls_create_confirmed' value='{t}Next{/t}'>
<input type='submit' name='create_acls_create_abort' value='{t}Abort{/t}'>
{else}
- <h2>{t}Create a new GOsa administrator account{/t}</h2>
+ <h2>{t}Create a new FusionDirectory administrator account{/t}</h2>
<p>
{t}This dialog will automatically add a new super administrator to your LDAP tree.{/t}
@@ -330,7 +330,7 @@
<h2>Department migration</h2>
- <p>{t}The listed departments are currently invisible in the GOsa user interface. If you want to change this for a couple of entries, select them and use the migrate button below.{/t}</p>
+ <p>{t}The listed departments are currently invisible in the FusionDirectory user interface. If you want to change this for a couple of entries, select them and use the migrate button below.{/t}</p>
<p>{t}If you want to know what will be done when migrating the selected entries, use the 'Show changes' button to see the LDIF.{/t}</p>
{foreach from=$deps_to_migrate item=val key=key}
@@ -385,7 +385,7 @@ dn: {$deps_to_migrate.$key.dn}
<h2>User migration</h2>
- <p>{t}The listed users are currently invisible in the GOsa user interface. If you want to change this for a couple of users, just select them and use the 'Migrate' button below.{/t}</p>
+ <p>{t}The listed users are currently invisible in the FusionDirectory user interface. If you want to change this for a couple of users, just select them and use the 'Migrate' button below.{/t}</p>
<p>{t}If you want to know what will be done when migrating the selected entries, use the 'Show changes' button to see the LDIF.{/t}</p>
{foreach from=$users_to_migrate item=val key=key}
@@ -441,7 +441,7 @@ dn: {$users_to_migrate.$key.dn}
<h2>Devices</h2>
- <p>{t}The listed devices are currently invisible in the GOsa interface. If you want to change this for a couple of devices, just select them and use the 'Migrate' button below.{/t}</p>
+ <p>{t}The listed devices are currently invisible in the FusionDirectory interface. If you want to change this for a couple of devices, just select them and use the 'Migrate' button below.{/t}</p>
<p>{t}If you want to know what will be done when migrating the selected entries, use the 'Show changes' button to see the LDIF.{/t}</p>
{foreach from=$devices item=item key=key}
<input type='checkbox' name='migrate_{$key}' id='migrate_{$key}' {if $item.DETAILS} checked {/if}>
@@ -485,7 +485,7 @@ dn: {$users_to_migrate.$key.dn}
<h2>Services</h2>
- <p>{t}The listed services are currently invalid for the GOsa version you are going to install. If you want to update a couple of service, just select them and use the 'Migrate' button below.{/t}</p>
+ <p>{t}The listed services are currently invalid for the FusionDirectory version you are going to install. If you want to update a couple of service, just select them and use the 'Migrate' button below.{/t}</p>
<p>{t}If you want to know what will be done when migrating the selected entries, use the 'Show changes' button to see the LDIF.{/t}</p>
{foreach from=$services item=item key=key}
<input type='checkbox' name='migrate_{$key}' id='migrate_{$key}' {if $item.DETAILS} checked {/if}>
@@ -529,7 +529,7 @@ dn: {$users_to_migrate.$key.dn}
<h2>Application menus</h2>
- <p>{t}The listed menus are currently invisible in the GOsa interface. If you want to change this for a couple of devices, just select them and use the 'Migrate' button below.{/t}</p>
+ <p>{t}The listed menus are currently invisible in the FusionDirectory interface. If you want to change this for a couple of devices, just select them and use the 'Migrate' button below.{/t}</p>
<p>{t}If you want to know what will be done when migrating the selected entries, use the 'Show changes' button to see the LDIF.{/t}</p>
{foreach from=$menus item=item key=key}
<input type='checkbox' name='migrate_{$key}' id='migrate_{$key}' {if $item.DETAILS} checked {/if}>
diff --git a/setup/setup_schema.tpl b/setup/setup_schema.tpl
index 908b989b7..5addb7cf4 100644
--- a/setup/setup_schema.tpl
+++ b/setup/setup_schema.tpl
@@ -32,7 +32,7 @@
<br>
{if !$database_initialised}
<br>
- {t}It seems that your ldap database wasn't initialized yet. This maybe the reason, why GOsa can't read your schema configuration!{/t}
+ {t}It seems that your ldap database wasn't initialized yet. This maybe the reason, why FusionDirectory can't read your schema configuration!{/t}
{/if}
{else}
{foreach from=$checks item=val key=key}
diff --git a/setup/setup_welcome.tpl b/setup/setup_welcome.tpl
index d040ef08f..86b6c7e85 100644
--- a/setup/setup_welcome.tpl
+++ b/setup/setup_welcome.tpl
@@ -1,7 +1,7 @@
<div>
<div class='default'>
<p>
- {t}This seems to be the first time you start GOsa - we didn't find any configuration right now. This simple wizard intends to help you while setting it up.{/t}
+ {t}This seems to be the first time you start FusionDirectory - we didn't find any configuration right now. This simple wizard intends to help you while setting it up.{/t}
</p>
<p style='border-top:1px solid #AAAAAA; padding-top:10px;'>
--
GitLab