Updated generateLdif method

[gosa.git] / gosa-core / include / class_core.inc

diff --git a/gosa-core/include/class_core.inc b/gosa-core/include/class_core.inc
index dc55acf27c162d0012d9e760dbf0b9823d4e5ac8..6f9df0b45fcf17070a033a4d538a7f4ec65cf0b5 100644 (file)
--- a/gosa-core/include/class_core.inc
+++ b/gosa-core/include/class_core.inc
@@ -172,7 +172,12 @@ class core extends plugin {
                 $list = array('mail' => 'mail','uid' => 'uid');
                 break;
             case 'mailMethod': 
-                $list = mailMethod::get_methods();
+                $tmp = mailMethod::get_methods();
+                $list =array();
+                foreach($tmp as $name => $value){
+                    $name = preg_replace('/^mailMethod/','', $name);
+                    $list[$name] = $value;
+                }
                 $list[''] = _("None");
                 break;
             case 'language':
@@ -227,12 +232,32 @@ class core extends plugin {
                             "name"          => "htaccessAuthentication",
                             "type"          => "bool",
                             "default"       => "false",
-                            "description"   => _("The 'htaccessAuthentication' variable tells GOsa to use either htaccess authentication or LDAP authentication. This can be used if you want to use i.e. kerberos to authenticate the users."),
+                            "description"   => _("The 'htaccessAuthentication' variable tells GOsa to use either htaccess authentication or LDAP authentication. This can be used if you want to use i.e. Kerberos to authenticate the users."),
                             "check"         => "gosaProperty::isBool",
                             "migrate"       => "",
                             "group"         => "authentification",
                             "mandatory"     => TRUE),
 
+                        array(
+                            "name"          => "statsDatabaseEnabled",
+                            "type"          => "bool",
+                            "default"       => "false",
+                            "description"   => _("Enables/Disables GOSa usage statistics moduls."),
+                            "check"         => "gosaProperty::isBool",
+                            "migrate"       => "",
+                            "group"         => "core",
+                            "mandatory"     => TRUE),
+
+                        array(
+                                "name"          => "statsDatabaseDirectory",
+                                "type"          => "path",
+                                "default"       => "/var/spool/gosa/stats",
+                                "description"   => _("The database file for GOSa usage statistics."),
+                                "check"         => "gosaProperty::isWriteablePath",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => TRUE),
+
                         array(
                             "name"          => "logging",
                             "type"          => "bool",
@@ -285,6 +310,16 @@ class core extends plugin {
                                 "group"         => "password",
                                 "mandatory"     => FALSE),
 
+                        array(
+                                "name"          => "passwordProposalHook",
+                                "type"          => "command",
+                                "default"       => "",
+                                "description"   => _("The 'passwordProposalHook' can be used to let GOsa generate password proposals for you. Whenever you change a password, you can then decide whether to use the proposal or to manually specify a password.")." "._("Here is an example command:")." /usr/bin/apg -n1",
+                                "check"         => "gosaProperty::isCommand",
+                                "migrate"       => "",
+                                "group"         => "password",
+                                "mandatory"     => FALSE),
+
                         array(
                                 "name"          => "displayErrors",
                                 "type"          => "bool",
@@ -328,7 +363,7 @@ class core extends plugin {
 
                         array(
                                 "name"          => "forceGlobals",
-                                "type"          => "bool",
+                                "type"          => "noLdap",
                                 "default"       => "false",
                                 "description"   => _("The 'forceGlobals' statement enables PHP security checks to force register_global settings to be switched off."),
                                 "check"         => "gosaProperty::isBool",
@@ -338,7 +373,7 @@ class core extends plugin {
 
                         array(
                                 "name"          => "forceSSL",
-                                "type"          => "bool",
+                                "type"          => "noLdap",
                                 "default"       => "false",
                                 "description"   => _("The 'forceSSL' statement enables PHP security checks to force encrypted access to the web interface. GOsa will try to redirect to the same URL - just with https://"),
                                 "check"         => "gosaProperty::isBool",
@@ -398,7 +433,7 @@ class core extends plugin {
 
                         array(
                                 "name"          => "warnSSL",
-                                "type"          => "bool",
+                                "type"          => "noLdap",
                                 "default"       => "true",
                                 "description"   => _("The 'warnSSL' statement enables PHP security checks to detect non encrypted access to the web interface. GOsa will display a warning in this case."),
                                 "check"         => "gosaProperty::isBool",