From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 15 Sep 2011 07:56:15 +0000 (+0000)
Subject: Backports from trunk
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c2975384c18195384f245a159b8f78b07c0c0691;p=gosa.git

Backports from trunk
-Added new config flag
-Fixed samba hash hook
-Fixed loading of property values for drop down boxes


git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.7@20988 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/include/class_core.inc b/gosa-core/include/class_core.inc
index 0ee476809..61e486533 100644
--- a/gosa-core/include/class_core.inc
+++ b/gosa-core/include/class_core.inc
@@ -159,12 +159,12 @@ class core extends plugin {
                 break;
             case 'timezone': 
                 $tmp = timezone::_get_tz_zones();
-                foreach($tmp['TIMEZONES'] as $name => $offset){
+                foreach($tmp['TIMEZONES'] as $tzname => $offset){
                     if($offset >= 0){
-                        $list[$name] = $name." ( + ".sprintf("%0.2f",$offset/(60*60))." "._("hours").")";
+                        $list[$tzname] = $tzname." ( + ".sprintf("%0.2f",$offset/(60*60))." "._("hours").")";
                     }else{
                         $offset = $offset * -1;
-                        $list[$name] = $name." ( - ".sprintf("%0.2f",($offset/(60*60)))." "._("hours").")";
+                        $list[$tzname] = $tzname." ( - ".sprintf("%0.2f",($offset/(60*60)))." "._("hours").")";
                     }
                 }
                 break;
@@ -177,9 +177,9 @@ class core extends plugin {
                     $tmp = mailMethod::get_methods();
                 }
                 $list =array();
-                foreach($tmp as $name => $value){
-                    $name = preg_replace('/^mailMethod/','', $name);
-                    $list[$name] = $value;
+                foreach($tmp as $vName => $vValue){
+                    $vName = preg_replace('/^mailMethod/','', $vName);
+                    $list[$vName] = $vValue;
                 }
                 $list[''] = _("None");
                 break;
@@ -495,6 +495,16 @@ class core extends plugin {
                                 "group"         => "core",
                                 "mandatory"     => FALSE),
 
+                        array(
+                                "name"          => "allowUidProposalModification",
+                                "type"          => "bool",
+                                "default"       => "false",
+                                "description"   => _("Allows to modify uid-proposals when creating a new user from a user-template."),
+                                "check"         => "gosaProperty::isBool",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => FALSE),
+
                         array(
                                 "name"          => "modificationDetectionAttribute",
                                 "type"          => "switch",
@@ -572,7 +582,7 @@ DEBUG_SI      = 256"),
                         array(
                                 "name"          => "sambaHashHook",
                                 "type"          => "command",
-                                "default"       => "perl -MCrypt::SmbHash -e \"print join(q[:], ntlmgen \\\$ARGV[0]), $/;\"",
+                                "default"       => "perl -MCrypt::SmbHash -e \"print join(q[:], ntlmgen %password), $/;\"",
                                 "description"   => _("Command to create Samba NT/LM hashes. Required for password synchronization if you don't use supplementary services."),
                                 "check"         => "gosaProperty::isCommand",
                                 "migrate"       => "",
@@ -1051,7 +1061,16 @@ DEBUG_SI      = 256"),
                                 "check"         => "",
                                 "migrate"       => "",
                                 "group"         => "snapshot",
-                                "mandatory"     => FALSE)
+                                "mandatory"     => FALSE),
+                        array(
+                                "name"          => "forceTranslit",
+                                "type"          => "bool",
+                                "default"       => "false",
+                                "description"   => _("Enable transliteration of cyrillic characters for UID generation."),
+                                "check"         => "gosaProperty::isBool",
+                                "migrate"       => "",
+                                "group"         => "core",
+                                "mandatory"     => TRUE)
                             )));
     }
 }