New bunch of config values

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

diff --git a/gosa-core/FAQ b/gosa-core/FAQ
index 2ec3923c3dc7a3267a5a8f05279aa62cee9f66f3..4b1a1ed086624c71047d307e211fb6db5d8e6a17 100644 (file)
--- a/gosa-core/FAQ
+++ b/gosa-core/FAQ
@@ -255,13 +255,13 @@ A: Yes. Use the winstation parameter in your location section:
 
    <location name=...>
        ...
-       winstations="ou=machineaccounts"
+       sambaMachineAccountRDN="ou=machineaccounts"
        ... \>
 
 
 Q: GOsa doesn't seem to follow my referrals. What can I do?
 
-A: Place the option 'recursive = "true"' inside your locations definition
+A: Place the option 'ldapFollowReferrals = "true"' inside your locations definition
    and you should be fine.
 
 
@@ -378,7 +378,7 @@ Q: Microsoft Internet Explorer <=6 seems paints strange blocks around
 
 A: Use Firefox, Konqueror, Safari, Opera, IE >= 7, etc. IE is broken and
    I don't want to waste my time with working around this old crap. There's
-   a quick hack, if you just put "ie_png_workaround='true'" inside the main
+   a quick hack, if you just put "iePngWorkaround='true'" inside the main
    section of your gosa.conf. This is a JavaScript based workaround and I've
    to place a WARNING here, that it is damn slow if you've large lists to
    display.
@@ -396,7 +396,7 @@ A: Yes. Browse to "password.php". You can preset a couple of things i.e.:
 
 Q: GOsa only shows 300 entries at a time. Is this normal?
 
-A: There's a default sizelimit. You can set the "sizelimit" option in your
+A: There's a default sizelimit. You can set the "ldapSizelimit" option in your
    gosa.conf's  location section to a higher value to get rid of it.
 
 
@@ -407,7 +407,7 @@ A: You can set a nesting limit which ensures that the user names will not be
    resolved if the amount of members reaches this limit.
    <location
         ...
-        LDAP_FILTER_NESTING_LIMIT="100"
+        ldapFilterNestingLimit="100"
         ... />
    </location>
 
@@ -424,5 +424,5 @@ Q: I've shredded my access control and am not able to do anything from now on. I
 
 A: Yes. Insert the following statement in the location section of your gosa.conf:
 
-   ignore_acl="your user's dn"
+   ignoreAcl="your user's dn"
 

diff --git a/gosa-core/contrib/gosa.conf.5 b/gosa-core/contrib/gosa.conf.5
index deaaa40f8b01d8313ebb4c1a36dfc13d5398da86..9fd72e779c801455f8f13f3061fb281c5513c4db 100644 (file)
--- a/gosa-core/contrib/gosa.conf.5
+++ b/gosa-core/contrib/gosa.conf.5
@@ -194,29 +194,29 @@ each location definition inside of this global definition.
 .B Generic options
 
 .PP
-.B forceglobals
+.B forceGlobals
 .I bool
 .PP
 The
-.I forceglobals
+.I forceGlobals
 statement enables PHP security checks to force register_global settings to
 be switched off.
 .PP
 
-.B forcessl
+.B forceSSL
 .I bool
 .PP
 The
-.I forceglobals
+.I 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://.
 .PP
 
-.B warnssl
+.B warnSSL
 .I bool
 .PP
 The
-.I warnssl
+.I warnSSL
 statement enables PHP security checks to detect non encrypted access to
 the web interface. GOsa will display a warning in this case.
 .PP
@@ -413,20 +413,20 @@ variable defines a plain text file which contains additional resolutions
 to be shown in the environment and system plugins.
 .PP
 
-.B htaccess_auth
+.B htaccessAuthentication
 .I bool
 .PP
 The
-.I htaccess_auth
+.I 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.
 .PP
 
-.B gosa_si
+.B gosaSupportURI
 .I URI
 .PP
 The
-.I gosa_si
+.I gosaSupportURI
 defines the major gosa-si server host and the password for GOsa to connect to it.
 can be used if you want to use i.e. kerberos to authenticate the users.
 
@@ -522,11 +522,11 @@ want to set it to
 if your group plugin is slow.
 .PP
 
-.B ie_png_workaround
+.B iePngWorkaround
 .I bool
 .PP
 The
-.I ie_png_workaround
+.I iePngWorkaround
 variable enables or disables a workaround for IE < 7 in order to display transparent
 PNG files correctly. This drastically slows down browsing. Please use Firefox or Opera
 instead.
@@ -683,7 +683,7 @@ defined departments. The default is
 .I ou=groups.
 .PP
 
-.B winstations
+.B sambaMachineAccountRDN
 .I string
 .PP
 This statement defines the location where GOsa looks for new samba workstations.
@@ -777,11 +777,11 @@ components. Default is
 .I ou=systems.
 .PP
 
-.B ldap_filter_nesting_limit
+.B ldapFilterNestingLimit
 .I integer
 .PP
 The
-.I ldap_filter_nesting_limit
+.I ldapFilterNestingLimit
 statement can be used to speed up group handling for groups with several hundreds of members.
 The default behaviour is, that GOsa will resolv the memberUid values in a group to real names.
 To achieve this, it writes a single filter to minimize searches. Some LDAP servers (namely
@@ -789,20 +789,20 @@ Sun DS) simply crash when the filter gets too big. You can set a member limit, w
 stop to do these lookups.
 .PP
 
-.B sizelimit
+.B ldapSizelimit
 .I integer
 .PP
 The
-.I sizelimit
+.I ldapSizelimit
 statement tells GOsa to retrieve the specified maximum number of results. The user will get
 a warning, that not all entries were shown.
 .PP
 
-.B recursive
+.B ldapFollowReferrals
 .I bool
 .PP
 The
-.I recursive
+.I ldapFollowReferrals
 statement tells GOsa to follow LDAP referrals.
 .PP
 .PP
@@ -969,16 +969,16 @@ setup this can drastically improve the windows login performance.
 
 .B Asterisk options
 .PP
-.B ctihook
+.B ctiHook
 .I path
 .PP
 The
-.I ctihook
+.I ctiHook
 statement defines a script to be executed if someone clicks on a phone number
 inside of the addressbook plugin. It gets called with two parameters:
 
 .nf
-ctihook $source_number $destination_number
+ctiHook $source_number $destination_number
 .fi
 
 This script can be used to do automatted dialing from the addressbook.
@@ -1012,19 +1012,19 @@ The
 statement determines if GOsa should use "foo/bar" or "foo.bar" namespaces
 in IMAP. Unix style is with slashes.
 
-.B additionalrestrictionfilters
+.B postfixRestrictionFilters
 .I path
 .PP
 The
-.I additionalrestrictionfilters
+.I postfixRestrictionFilters
 statement defines a file to include for the postfix module in order
 to display user defined restriction filters.
 
-.B additionalprotocols
+.B postfixProtocols
 .I path
 .PP
 The
-.I additionalprotocols
+.I postfixProtocols
 statement defines a file to include for the postfix module in order
 to display user defined protocols.
 
@@ -1081,11 +1081,11 @@ statement tells GOsa to track LDAP timing statistics to the syslog. This may
 help to find indexing problems or bad search filters.
 .PP
 
-.B ignore_acl
+.B ignoreAcl
 .I dn
 .PP
 The
-.I ignore_acl
+.I ignoreAcl
 value tells GOsa to ignore complete ACL sets for the given DN. Add your
 DN here and you'll be able to restore accidently dropped ACLs.
 .PP

diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php
index 11c11c6a453f63be13194f9f705ea019c85b3d5d..390def98a997d62ab6d89e3e4b1446787d91c6f5 100644 (file)
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
@@ -209,7 +209,7 @@ if ($config->get_cfg_value("forcessl") == 'true' && $ssl != ''){
 
 /* Do we have htaccess authentification enabled? */
 $htaccess_authenticated= FALSE;
-if ($config->get_cfg_value("htaccess_auth") == "true" ){
+if ($config->get_cfg_value("htaccessAuthentication") == "true" ){
   if (!isset($_SERVER['REMOTE_USER'])){
     msg_dialog::display(_("Configuration error"), _("There is a problem with the authentication setup!"), FATAL_ERROR_DIALOG);
     exit;
@@ -260,7 +260,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
     $config->data['MAIN']['SCHEMACHECK'] = "true";
   }
   if ($config->get_cfg_value("schemaCheck") == "true"){
-    $recursive = ($config->get_cfg_value("recursive") == "true");
+    $recursive = ($config->get_cfg_value("ldapFollowReferrals") == "true");
     $tls =       ($config->get_cfg_value("ldapTLS") == "true");
 
     if(!count($ldap->get_objectclasses())){

diff --git a/gosa-core/html/logout.php b/gosa-core/html/logout.php
index f68a481484210be29a31a16280f2967ca3d414f2..31454b15cadc932f689ba69ee7243211266445cc 100644 (file)
--- a/gosa-core/html/logout.php
+++ b/gosa-core/html/logout.php
@@ -78,7 +78,7 @@ if (isset($_GET['request'])){
   session::destroy ();
   
   /* If we're not using htaccess authentication, just redirect... */
-  if (isset($config) && $config->get_cfg_value("htaccess_auth") == "true"){
+  if (isset($config) && $config->get_cfg_value("htaccessAuthentication") == "true"){
 
     /* Else notice that the user has to close the browser... */
     $smarty->display (get_template_path('headers.tpl'));

diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc
index 94309fe64afc660c9ce8359d9664251fa0545217..1d5a9387fcdaba723bcda08b1b248138de08be9b 100644 (file)
--- a/gosa-core/include/class_config.inc
+++ b/gosa-core/include/class_config.inc
@@ -262,8 +262,8 @@ class config  {
       }
 
       if (!session::is_set('size_limit')){
-        session::set('size_limit',$this->current['SIZELIMIT']);
-        session::set('size_ignore',$this->current['SIZEIGNORE']);
+        session::set('size_limit',$this->current['LDAPSIZELIMIT']);
+        session::set('size_ignore',$this->current['LDAPSIZEIGNORE']);
       }
 
       if ($sizelimit){
@@ -305,8 +305,8 @@ class config  {
     $this->current['GROUPS'] = preg_replace("/,*$/","",$this->current['GROUPRDN']);
     $this->current['USERRDN'] = preg_replace("/,*$/","",$this->current['USERRDN']);
 
-    if (!isset($this->current['WINSTATIONS'])){
-      $this->current['WINSTATIONS']= "ou=winstations,ou=systems";
+    if (!isset($this->current['SAMBAMACHINEACCOUNTRDN'])){
+      $this->current['SAMBAMACHINEACCOUNTRDN']= "ou=winstations,ou=systems";
     }
     if (!isset($this->current['HASH'])){
       $this->current['HASH']= "crypt";
@@ -317,16 +317,16 @@ class config  {
     if (!isset($this->current['MINID'])){
       $this->current['MINID']= 100;
     }
-    if (!isset($this->current['SIZELIMIT'])){
-      $this->current['SIZELIMIT']= 200;
+    if (!isset($this->current['LDAPSIZELIMIT'])){
+      $this->current['LDAPSIZELIMIT']= 200;
     }
     if (!isset($this->current['SIZEINGORE'])){
-      $this->current['SIZEIGNORE']= TRUE;
+      $this->current['LDAPSIZEIGNORE']= TRUE;
     } else {
-      if (preg_match("/true/i", $this->current['SIZEIGNORE'])){
-        $this->current['SIZEIGNORE']= TRUE;
+      if (preg_match("/true/i", $this->current['LDAPSIZEIGNORE'])){
+        $this->current['LDAPSIZEIGNORE']= TRUE;
       } else {
-        $this->current['SIZEIGNORE']= FALSE;
+        $this->current['LDAPSIZEIGNORE']= FALSE;
       }
     }
 

diff --git a/gosa-core/include/class_gosaSupportDaemon.inc b/gosa-core/include/class_gosaSupportDaemon.inc
index a0b121e5046eaa77a6ba6ed0a8431f24445340fa..2a7ff4dd2ce8b8326973a400a781578441cdca55 100644 (file)
--- a/gosa-core/include/class_gosaSupportDaemon.inc
+++ b/gosa-core/include/class_gosaSupportDaemon.inc
@@ -53,12 +53,12 @@ class gosaSupportDaemon
     if(!is_object($config)) { return; }
 
     # load from config, store statically
-    if ($config->get_cfg_value("gosa_si") != ""){
+    if ($config->get_cfg_value("gosaSupportURI") != ""){
 
       if ($this->s_host == ""){
-        $this->s_host= preg_replace("/^.*@([^:]+):.*$/", "$1", $config->get_cfg_value("gosa_si"));
-        $this->i_port= preg_replace("/^.*@[^:]+:(.*)$/", "$1", $config->get_cfg_value("gosa_si"));
-        $this->s_encryption_key = preg_replace("/^(.*)@[^:]+:.*$/", "$1", $config->get_cfg_value("gosa_si"));
+        $this->s_host= preg_replace("/^.*@([^:]+):.*$/", "$1", $config->get_cfg_value("gosaSupportURI"));
+        $this->i_port= preg_replace("/^.*@[^:]+:(.*)$/", "$1", $config->get_cfg_value("gosaSupportURI"));
+        $this->s_encryption_key = preg_replace("/^(.*)@[^:]+:.*$/", "$1", $config->get_cfg_value("gosaSupportURI"));
       }
 
       $this->f_timeout = $timeout;
@@ -85,7 +85,7 @@ class gosaSupportDaemon
         new log("debug","gosaSupportDaemon::connect()", "Cannot connect to si-server", array(),$this->get_error());
       }
     }else{
-      $this->set_error(msgPool::cmdnotfound("GOSA_SI",_("GOsa support daemon")));
+      $this->set_error(msgPool::cmdnotfound("gosaSupportURI",_("GOsa support daemon")));
     }
     return($this->is_connected);
   }

diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc
index 423694c8a7df021ab160120ec0dcd4ff85b21b9e..580c7c470d96c02e88b80902ce0ec4ad7f50c265 100644 (file)
--- a/gosa-core/include/class_userinfo.inc
+++ b/gosa-core/include/class_userinfo.inc
@@ -644,7 +644,7 @@ class userinfo
    */ 
   function ignore_acl_for_current_user()
   {
-    return($this->config->get_cfg_value("ignore_acl") == $this->dn);
+    return($this->config->get_cfg_value("ignoreAcl") == $this->dn);
   }
 
 }

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index d35693d6b6803d98630f19a5db3e11eda186654e..ddd59b46639c761d71285e08ddcdeda366beb52d 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -344,7 +344,7 @@ function ldap_init ($server, $base, $binddn='', $pass='')
   global $config;
 
   $ldap = new LDAP ($binddn, $pass, $server,
-      isset($config->current['RECURSIVE']) && $config->current['RECURSIVE'] == "true",
+      isset($config->current['LDAPFOLLOWREFERRALS']) && $config->current['LDAPFOLLOWREFERRALS'] == "true",
       isset($config->current['LDAPTLS']) && $config->current['LDAPTLS'] == "true");
 
   /* Sadly we've no proper return values here. Use the error message instead. */
@@ -503,8 +503,8 @@ function ldap_login_user ($username, $password)
   /* password check, bind as user with supplied password  */
   $ldap->disconnect();
   $ldap= new LDAP($ui->dn, $password, $config->current['SERVER'],
-      isset($config->current['RECURSIVE']) &&
-      $config->current['RECURSIVE'] == "true",
+      isset($config->current['LDAPFOLLOWREFERRALS']) &&
+      $config->current['LDAPFOLLOWREFERRALS'] == "true",
       isset($config->current['LDAPTLS'])
       && $config->current['LDAPTLS'] == "true");
   if (!$ldap->success()){
@@ -1162,7 +1162,7 @@ function get_ou($name)
                 "printerou"     => "ou=printers,ou=systems,",
                 "phoneou"       => "ou=phones,ou=systems,",
                 "componentou"   => "ou=netdevices,ou=systems,",
-                "winstations"   => "ou=winstation,",
+                "sambaMachineAccountRDN"   => "ou=winstation,",
 
                 "blocklistou"   => "ou=gofax,ou=systems,",
                 "incomingou"    => "ou=incoming,",
@@ -1227,7 +1227,7 @@ function get_groups_ou()
 
 function get_winstations_ou()
 {
-  return (get_ou("WINSTATIONS"));
+  return (get_ou("SAMBAMACHINEACCOUNTRDN"));
 }
 
 
@@ -2585,7 +2585,7 @@ function generate_smb_nt_hash($password)
   global $config;
 
   # Try to use gosa-si?
-  if ($config->get_cfg_value("gosa_si") != ""){
+  if ($config->get_cfg_value("gosaSupportURI") != ""){
        $res= gosaSupportDaemon::send("gosa_gen_smb_hash", "GOSA", array("password" => $password), TRUE);
     if (isset($res['XML']['HASH'])){
        $hash= $res['XML']['HASH'];

diff --git a/gosa-core/plugins/admin/groups/class_groupGeneric.inc b/gosa-core/plugins/admin/groups/class_groupGeneric.inc
index 543bca59684901f2d651d57886b3ec4b51a6eb34..14bb6d69de5b164083cfcff4b4d81a0ab70b4e01 100644 (file)
--- a/gosa-core/plugins/admin/groups/class_groupGeneric.inc
+++ b/gosa-core/plugins/admin/groups/class_groupGeneric.inc
@@ -658,8 +658,8 @@ class group extends plugin
          to be prepared when adding/deleting users)
      */    
     $filter = "";
-    if ($this->config->get_cfg_value("ldap_filter_nesting_limit") == "" ||
-        count($this->memberUid) < $this->config->get_cfg_value("ldap_filter_nesting_limit")){
+    if ($this->config->get_cfg_value("ldapFilterNestingLimit") == "" ||
+        count($this->memberUid) < $this->config->get_cfg_value("ldapFilterNestingLimit")){
       foreach ($this->memberUid as $value){
         if(!isset($this->members[$value])){
           $filter .= "(uid=".normalizeLdap($value).")";
@@ -678,8 +678,8 @@ class group extends plugin
     }
   
     /* check if all uids are resolved */
-    if ($this->config->get_cfg_value("ldap_filter_nesting_limit") == "" ||
-        count($this->memberUid) < $this->config->get_cfg_value("ldap_filter_nesting_limit")){
+    if ($this->config->get_cfg_value("ldapFilterNestingLimit") == "" ||
+        count($this->memberUid) < $this->config->get_cfg_value("ldapFilterNestingLimit")){
       foreach ($this->memberUid as $value){
         if(!isset($this->members[$value])){
           $this->members[$value] =  _("! unknown id")." [".$value."]"; 

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index 497183659bfa9210504bbcc1ec611415001becc6..a41cff9867536e5917787790d4105e7e6ed78a21 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -660,7 +660,7 @@ class ogroup extends plugin
         "workstations"    => array("OBJ"=>"workgeneric", "CLASS"=>"gotoWorkstation",
           "DN"=> get_ou('workstationou')   ,"ACL" => "workstation"),
         "winstations"     => array("OBJ"=>"wingeneric", "CLASS"=>"opsiClient",        
-          "DN"=> get_ou('WINSTATIONS')     ,"ACL" => "winstation"),
+          "DN"=> get_ou('SAMBAMACHINEACCOUNTRDN')     ,"ACL" => "winstation"),
         "terminals"       => array("OBJ"=>"termgeneric", "CLASS"=>"gotoTerminal"   ,
           "DN"=> get_ou('terminalou')      ,"ACL" => "terminal"),
         "printers"        => array("OBJ"=>"printgeneric", "CLASS"=>"gotoPrinter"    ,

diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index eca6c0a0a09f47559e71bfdf7da10b4ca7476089..66464197e96cd0c115b9d11019107f7079f5136e 100644 (file)
--- a/gosa-core/plugins/personal/generic/class_user.inc
+++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -1085,7 +1085,7 @@ class user extends plugin
         die ("Could not connect to LDAP server");
       }
       ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
-      if (function_exists("ldap_set_rebind_proc") && $this->config->get_cfg_value("recursive") == "true") {
+      if (function_exists("ldap_set_rebind_proc") && $this->config->get_cfg_value("ldapFollowReferrals") == "true") {
         ldap_set_option($this->cid, LDAP_OPT_REFERRALS, 1);
         ldap_set_rebind_proc($ds, array(&$this, "rebind"));
       }
@@ -1296,7 +1296,7 @@ class user extends plugin
   {
     $ds= ldap_connect($this->config->current['SERVER']);
     ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
-    if (function_exists("ldap_set_rebind_proc") && $this->config->get_cfg_value("recursive") == "true"){
+    if (function_exists("ldap_set_rebind_proc") && $this->config->get_cfg_value("ldapFollowReferrals") == "true"){
       ldap_set_option($this->cid, LDAP_OPT_REFERRALS, 1);
       ldap_set_rebind_proc($ds, array(&$this, "rebind"));
     }

diff --git a/gosa-core/plugins/personal/password/class_password.inc b/gosa-core/plugins/personal/password/class_password.inc
index e3684e05e14b31f916fe61b16e313bf66eea7d2c..db087e57cb2aa821eb615c1f7f0f945d193ebb50 100644 (file)
--- a/gosa-core/plugins/personal/password/class_password.inc
+++ b/gosa-core/plugins/personal/password/class_password.inc
@@ -99,7 +99,7 @@ class password extends plugin
             $ui->dn, 
             $_POST['current_password'],
             $this->config->current['SERVER'],
-            $this->config->get_cfg_value("recursive") == "true",
+            $this->config->get_cfg_value("ldapFollowReferrals") == "true",
             $this->config->get_cfg_value("ldapTLS") == "true");
 
         /* connection Successfull ? */

diff --git a/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc b/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc
index 43af501a2aa2615584e6bfb48b8bb8d29c3c0400..b4dd9a3357cd1a9fc4f08233e945c39cedab799c 100644 (file)
--- a/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc
+++ b/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc
@@ -137,7 +137,7 @@ class addressbook extends plugin
     /* Perform actions with CTI hook */
     if (isset($_GET['target'])
         && isset($_GET['dial'])
-        && $this->config->get_cfg_value("ctihook") != "" ){
+        && $this->config->get_cfg_value("ctiHook") != "" ){
 
       $dialmode= $_GET['dial'];
       if ($dialmode == "telephoneNumber" ||
@@ -183,7 +183,7 @@ class addressbook extends plugin
 
     /* Finally dial */
     if (isset($_POST['dial']) && session::is_set('source') && session::is_set('target')){
-      exec ($this->config->get_cfg_value("ctihook")." '".session::get('source')."' '".session::get('target')."'", $dummy, $retval);
+      exec ($this->config->get_cfg_value("ctiHook")." '".session::get('source')."' '".session::get('target')."'", $dummy, $retval);
       session::un_set('source');
       session::un_set('target');
     }

diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
index 407c6f4022995757e957a5edeaba66783d7c742d..18aa50c93b072b9e5f48e83f3f186d43750f88d7 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
@@ -71,7 +71,7 @@ class workstartup extends plugin
     plugin::plugin ($config, $dn, $parent);
 
     /* Check for si daemon */
-    $this->si_active = $this->config->get_cfg_value("gosa_si") != "";
+    $this->si_active = $this->config->get_cfg_value("gosaSupportURI") != "";
 
     /* Check object group membership */
     if(!isset($this->parent->by_object['ogroup'])){

diff --git a/gosa-plugins/mail/admin/systems/services/mail/class_goMailServer.inc b/gosa-plugins/mail/admin/systems/services/mail/class_goMailServer.inc
index 660aa483923cca88dc4fe02af1d59e24ebddfaf8..210d8cfddc45175b56ed7944254a56fcfb345ee4 100644 (file)
--- a/gosa-plugins/mail/admin/systems/services/mail/class_goMailServer.inc
+++ b/gosa-plugins/mail/admin/systems/services/mail/class_goMailServer.inc
@@ -52,8 +52,8 @@ class goMailServer extends goService{
     $str = $this->config->data['TABS']['SERVERSERVICE'];
     $this->TransportProtocols =array("smtp"=>"SMTP");
     $this->RestrictionFilters = array("FILTER"=>"FILTER"); 
-    foreach(array("ADDITIONALRESTRICTIONFILTERS"=>"RestrictionFilters",
-          "ADDITIONALPROTOCOLLS"        =>"TransportProtocols") as $file => $var){
+    foreach(array("POSTFIXRESTRICTIONFILTERS"=>"RestrictionFilters",
+          "POSTFIXPROTOCOLS"        =>"TransportProtocols") as $file => $var){
       if($this->config->get_cfg_value($file) != ""){
         $file = $this->config->get_cfg_value($file);
         if((isset($file)) && is_readable($file)){

diff --git a/gosa-plugins/opsi/admin/opsi/class_opsi.inc b/gosa-plugins/opsi/admin/opsi/class_opsi.inc
index 2efe2be9d662ba3306df2ed2857edc3affb24245..144dbc2dfdee6b82b2b91de28ccece31455ed64b 100644 (file)
--- a/gosa-plugins/opsi/admin/opsi/class_opsi.inc
+++ b/gosa-plugins/opsi/admin/opsi/class_opsi.inc
@@ -87,7 +87,7 @@ class opsi extends gosaSupportDaemon
     foreach($res as $entry){
       if(!isset($entry['MAC'][0]['VALUE'])) $entry['MAC'][0]['VALUE'] = "";
       $data[] = array(
-        "dn"          => "opsi:=".$entry['NAME'][0]['VALUE'].",".get_ou("winstations").$this->config->current['BASE'],
+        "dn"          => "opsi:=".$entry['NAME'][0]['VALUE'].",".get_ou("sambaMachineAccountRDN").$this->config->current['BASE'],
         "objectClass" => array("gosa_opsi_client"),
         "cn"          => array(0 => $entry['NAME'][0]['VALUE']),
         "description" => array(0 => $entry['DESCRIPTION'][0]['VALUE']),

diff --git a/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc b/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc
index c210b96f61e2defd03310bccb5455b62252241de..ab515d6b95c8836cae038303cb769d4fbe00a6d7 100644 (file)
--- a/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc
+++ b/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc
@@ -201,7 +201,7 @@ class wingeneric extends plugin
     /* Call common method to give check the hook */
     $message= plugin::check();
     $message= array_merge($message, $this->netConfigDNS->check());
-    $this->dn= "cn=".$this->uid.",".get_ou('winstations').$this->base;
+    $this->dn= "cn=".$this->uid.",".get_ou('sambaMachineAccountRDN').$this->base;
 
     if(!$this->acl_is_createable()){
       $message[]= msgPool::permCreate();