Updated a couple of values

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

diff --git a/gosa-core/FAQ b/gosa-core/FAQ
index b662504fd824038b18ef223615274c4c3fb55fb0..fc072e156a5754178440187319bfdb5cb09d3e76 100644 (file)
--- a/gosa-core/FAQ
+++ b/gosa-core/FAQ
@@ -196,8 +196,8 @@ Q: I really don't want dn's containing the CN for user accounts because I don't
    want to support anonymous binds for uid resolution. Is it possible to have dn's
    containing the uid instead?
 
-A: Yes. Placing the dnmode="uid" keyword in your gosa.conf's location section will
-   solve your problem.
+A: Yes. Placing the accountPrimaryAttribute="uid" keyword in your gosa.conf's location
+   section will solve your problem.
 
 
 Q: Hey, I've installed GOsa, but it claims something about "SID and / or RIDBASE
@@ -368,7 +368,7 @@ A: Yes. Download http://standards.ieee.org/regauth/oui/oui.txt and place
 
 Q: GOsa sessions expire too quick. Is there a way to change this?
 
-A: Yes. Set "session_lifetime" to the number of seconds of inactivity. 7200
+A: Yes. Set "sessionLifetime" to the number of seconds of inactivity. 7200
    (60x60x2) would be for two hours. Place this option inside the main
    section of your gosa.conf.
    

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index c5869b2c467fac98ed533a78ace0fc23f1258eb4..8d5ae5d210bdfd3b6ab9eacd966ae8016d8cb02e 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -495,8 +495,8 @@
     <location name="{$cv.location}"
               passwordDefaultHash="{$cv.encryption}"
               accountPrimaryAttribute="{$cv.peopledn}"
-              userSubtree="{$cv.peopleou}"
-              groupSubtree="{$cv.groupou}"
+              userRDN="{$cv.peopleou}"
+              groupRDN="{$cv.groupou}"
               gidNumberBase="{$cv.uidbase}"
               uidNumberBase="{$cv.uidbase}"
               logging="{$cv.generic_settings.logging}"

diff --git a/gosa-core/contrib/gosa.conf.5 b/gosa-core/contrib/gosa.conf.5
index c6cd24ee2f8e56aa77fe7f3b83f4a86820469496..a581a9faebdf033662be461dce745ef46c6f29ba 100644 (file)
--- a/gosa-core/contrib/gosa.conf.5
+++ b/gosa-core/contrib/gosa.conf.5
@@ -177,7 +177,7 @@ each location definition inside of this global definition.
 
         <location name="Example Net"
                   hash="md5"
-                  dnmode="cn"
+                  accountPrimaryAttribute="cn"
                   ...
 
                   <referral url="ldaps://ldap.example.net:636/dc=example,dc=net"
@@ -221,11 +221,11 @@ statement enables PHP security checks to detect non encrypted access to
 the web interface. GOsa will display a warning in this case.
 .PP
 
-.B uniq_identifier
+.B modificationDetectionAttribute
 .I string
 .PP
 The
-.I uniq_identifier
+.I modificationDetectionAttribute
 statement enables GOsa to check if a entry currently being edited has
 been modified from someone else outside GOsa in the meantime. It will
 display an informative dialog then. It can be set to
@@ -329,11 +329,11 @@ statement defines the LDAP base, where GOsa stores management information,
 such as site wide locking and user notifications.
 .PP
 
-.B compile
+.B templateCompileDirectory
 .I path
 .PP
 The
-.I compile
+.I templateCompileDirectory
 statements defines the path, where the PHP templating engins
 .I smarty
 should store its compiled GOsa templates for improved speed. This path
@@ -396,11 +396,11 @@ on unix systems, you've to adjust your NSS configuration to
 use rfc2307bis style groups, too.
 .PP
 
-.B ppd_path
+.B ppdPath
 .I path
 .PP
 The
-.I ppd_path
+.I ppdPath
 variable defines where to store PPD files for the GOto environment plugins.
 .PP
 
@@ -459,30 +459,30 @@ statement sets the icon size in the main menu. Its value should be something
 like 48x48.
 .PP
 
-.B compressed
+.B sendCompressedOutput
 .I true/false
 .PP
 The
-.I compressed
+.I sendCompressedOutput
 statement determines whether PHP should send compressed HTML pages to
 browsers or not. This may increase or decrease the performance, depending
 on your network.
 .PP
 
-.B save_filter
+.B storeFilterSettings
 .I true/false
 .PP
 The
-.I save_filter
+.I storeFilterSettings
 statement determines whether GOsa should store filter and plugin settings
 inside of a cookie.
 .PP
 
-.B lang
+.B language
 .I string
 .PP
 The
-.I lang
+.I language
 statement defines the default language used by GOsa. Normally GOsa autodetects
 the language from the browser settings. If this is not working or you want to
 force the language, just add the language code (i.e. de for german) here.
@@ -500,21 +500,21 @@ within themes. Take a look at the GOsa
 for more information.
 .PP
 
-.B session_lifetime
+.B sessionLifetime
 .I int
 .PP
 The
-.I session_lifetime
+.I sessionLifetime
 value defines when a session will expire in seconds. For Debian systems, this will
 not work because the sessions will be removed by a cron job instead. Please modify
 the value inside of your php.ini instead.
 .PP
 
-.B noprimarygroup
+.B primaryGroupFilter
 .I bool
 .PP
 The
-.I noprimarygroup
+.I primaryGroupFilter
 variable enables or disables the group filter to show primary user groups. It is
 time consuming to evaluate which groups are primary and which are not. So you may
 want to set it to
@@ -594,11 +594,11 @@ needed from time to time.
 
 .B LDAP options
 .PP
-.B max_ldap_query_time
+.B ldapMaxQueryTime
 .I integer
 .PP
 The
-.I max_ldap_query_time
+.I ldapMaxQueryTime
 statement tells GOsa to stop LDAP actions if there is no answer within the
 specified number of seconds.
 .PP
@@ -620,11 +620,11 @@ The
 statement enables or disables TLS operating on LDAP connections.
 .PP
 
-.B dnmode
+.B accountPrimaryAttribute
 .I cn/uid
 .PP
 The
-.I dnmode
+.I accountPrimaryAttribute
 option tells GOsa how to create new accounts. Possible values are
 .I uid
 and
@@ -638,7 +638,7 @@ In the second case, GOsa creates cn style DN entries:
 cn=Foo Bar,ou=staff,dc=example,dc=net
 .fi
 If you choose "cn" to be your
-.I dnmode
+.I accountPrimaryAttribute
 you can decide whether to include the personal title in your dn by
 selecting
 .I include_personal_title.
@@ -650,14 +650,14 @@ selecting
 The
 .I include_personal_title
 option tells GOsa to include the personal title in user DNs when
-.I dnmode
+.I accountPrimaryAttribute
 is set to "cn".
 
-.B people
+.B userRDN
 .I string
 .PP
 The
-.I people
+.I userRDN
 statement defines the location where new accounts will be created inside of
 defined departments. The default is
 .I ou=people.
@@ -942,11 +942,11 @@ statement defines the version of samba you want to write LDAP entries for. Be su
 to include the correct schema in this case. Valid values are 2 and 3.
 .PP
 
-.B smbhash
+.B sambaHashHook
 .I path
 .PP
 The
-.I smbhash
+.I sambaHashHook
 statement contains an executable to generate samba hash values. This is required
 for password synchronization, but not required if you apply gosa-si services.
 If you don't have mkntpasswd from the samba distribution installed, you can use

diff --git a/gosa-core/html/helpviewer.php b/gosa-core/html/helpviewer.php
index 95d56caaaba07b2ec6a15b1f10842d6861e28b00..c327b6c9bb6ee8744cde3b2cbbcedcbeef3fe2c7 100644 (file)
--- a/gosa-core/html/helpviewer.php
+++ b/gosa-core/html/helpviewer.php
@@ -42,7 +42,7 @@ $ui= session::get('ui');
 $config= session::get('config');
 
 /* Language setup */
-$lang= $config->get_cfg_value("lang");
+$lang= $config->get_cfg_value("language");
 if ($lang == ""){
   $lang= get_browser_language();
 }

diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php
index 6f0b1699f14b17136ef4a1d5d00c24081f3544e6..e9723e0e7b578e16705797dcda709b320d15806c 100644 (file)
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
@@ -151,12 +151,12 @@ if ($_SERVER["REQUEST_METHOD"] != "POST"){
 }
 
 /* Enable compressed output */
-if ($config->get_cfg_value("compressed") != ""){
+if ($config->get_cfg_value("sendCompressedOutput") != ""){
   ob_start("ob_gzhandler");
 }
 
 /* Set template compile directory */
-$smarty->compile_dir= $config->get_cfg_value("compile", '/var/spool/gosa');
+$smarty->compile_dir= $config->get_cfg_value("templateCompileDirectory", '/var/spool/gosa');
 
 /* Check for compile directory */
 if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
@@ -338,7 +338,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
       session::set('config',$config);
 
       /* Restore filter settings from cookie, if available */
-      if($config->get_cfg_value("save_filter") == "true"){
+      if($config->get_cfg_value("storeFilterSettings") == "true"){
 
         if(isset($_COOKIE['GOsa_Filter_Settings']) || isset($HTTP_COOKIE_VARS['GOsa_Filter_Settings'])){
 

diff --git a/gosa-core/html/logout.php b/gosa-core/html/logout.php
index 55b12943b84fa58768b128c9495d2b5bbf277537..f68a481484210be29a31a16280f2967ca3d414f2 100644 (file)
--- a/gosa-core/html/logout.php
+++ b/gosa-core/html/logout.php
@@ -45,10 +45,10 @@ if(session::is_set('ui')){
 }
 
 /* Language setup */
-if ((!isset($config)) || $config->get_cfg_value("lang") == ""){
+if ((!isset($config)) || $config->get_cfg_value("language") == ""){
   $lang= get_browser_language();
 } else {
-  $lang= $config->get_cfg_value("lang");
+  $lang= $config->get_cfg_value("language");
 }
 
 $lang.=".UTF-8";

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index 4df1c769cd719fac78dfc5f497ffecfc7fe92573..43f85119060831d154b19e3514e73480042d9c32 100644 (file)
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -65,7 +65,7 @@ $config->check_config_version();
 $config->check_and_reload();
 
 /* Enable compressed output */
-if ($config->get_cfg_value("compressed") == "true"){
+if ($config->get_cfg_value("sendCompressedOutput") == "true"){
   ob_start("ob_gzhandler");
 }
 
@@ -75,7 +75,7 @@ if(session::get('_LAST_PAGE_REQUEST') == ""){
 }else{
 
   /* check GOsa.conf for defined session lifetime */
-  $max_life= $config->get_cfg_value("session_lifetime", 60*60*2);
+  $max_life= $config->get_cfg_value("sessionLifetime", 60*60*2);
 
   /* get time difference between last page reload */
   $request_time = (time()- session::get('_LAST_PAGE_REQUEST'));
@@ -96,7 +96,7 @@ if(session::get('_LAST_PAGE_REQUEST') == ""){
 @DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config");
 
 /* Set template compile directory */
-$smarty->compile_dir= $config->get_cfg_value("compile", '/var/spool/gosa');
+$smarty->compile_dir= $config->get_cfg_value("templateCompileDirectory", '/var/spool/gosa');
 
 /* Set default */
 $reload_navigation = false;
@@ -417,7 +417,7 @@ if(isset($_COOKIE['GOsa_Filter_Settings'])){
 }
 
 /* Save filters? */
-if($config->get_cfg_value("save_filter") == "true"){
+if($config->get_cfg_value("storeFilterSettings") == "true"){
   $cookie_vars = array("MultiDialogFilters","CurrentMainBase");
   foreach($cookie_vars as $var){
     if(session::is_set($var)){

diff --git a/gosa-core/html/password.php b/gosa-core/html/password.php
index 0c395960eb4dc4c921bb030ffd830ef86cea9951..ef555df235dbe00478beabadc35f3649da43eedf 100644 (file)
--- a/gosa-core/html/password.php
+++ b/gosa-core/html/password.php
@@ -67,7 +67,7 @@ if ($_SERVER["REQUEST_METHOD"] != "POST"){
 }
 
 /* Set template compile directory */
-$smarty->compile_dir= $config->get_cfg_value("compile", '/var/spool/gosa');
+$smarty->compile_dir= $config->get_cfg_value("templateCompileDirectory", '/var/spool/gosa');
 
 /* Check for compile directory */
 if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
@@ -80,10 +80,10 @@ if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
 clean_smarty_compile_dir($smarty->compile_dir);
 
 /* Language setup */
-if ($config->get_cfg_value("lang") == ""){
+if ($config->get_cfg_value("language") == ""){
   $lang= get_browser_language();
 } else {
-  $lang= $config->get_cfg_value("lang");
+  $lang= $config->get_cfg_value("language");
 }
 $lang.=".UTF-8";
 putenv("LANGUAGE=");

diff --git a/gosa-core/html/setup.php b/gosa-core/html/setup.php
index e4be820b13353faaa4034969c3d5317e1f5c3a7e..b4d8054379a254773cd5132d8bb03986ffdc6072 100644 (file)
--- a/gosa-core/html/setup.php
+++ b/gosa-core/html/setup.php
@@ -69,8 +69,8 @@ if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
 }
 
 /* Get posted language */
-if(!session::is_set('lang')){
-  session::set('lang',get_browser_language());
+if(!session::is_set('language')){
+  session::set('language',get_browser_language());
 }
 if(isset($_POST['lang_selected'])){
   if($_POST['lang_selected'] != ""){

diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc
index ddc26fcf35dd01229e1386554c784406d2402f1f..481da05236d2f7d39cdca2c3e8db040025fd97ab 100644 (file)
--- a/gosa-core/include/class_config.inc
+++ b/gosa-core/include/class_config.inc
@@ -290,8 +290,8 @@ class config  {
     if (!isset($this->current['SAMBAVERSION'])){
       $this->current['SAMBAVERSION']= 3;
     }
-    if (!isset($this->current['PEOPLE'])){
-      $this->current['PEOPLE']= "ou=people";
+    if (!isset($this->current['USERRDN'])){
+      $this->current['USERRDN']= "ou=people";
     }
     if (!isset($this->current['GROUPS'])){
       $this->current['GROUPS']= "ou=groups";
@@ -303,7 +303,7 @@ class config  {
   
     /* Remove possibly added ',' from end of group and people ou */
     $this->current['GROUPS'] = preg_replace("/,*$/","",$this->current['GROUPS']);
-    $this->current['PEOPLE'] = preg_replace("/,*$/","",$this->current['PEOPLE']);
+    $this->current['USERRDN'] = preg_replace("/,*$/","",$this->current['USERRDN']);
 
     if (!isset($this->current['WINSTATIONS'])){
       $this->current['WINSTATIONS']= "ou=winstations,ou=systems";
@@ -311,8 +311,8 @@ class config  {
     if (!isset($this->current['HASH'])){
       $this->current['HASH']= "crypt";
     }
-    if (!isset($this->current['DNMODE'])){
-      $this->current['DNMODE']= "cn";
+    if (!isset($this->current['ACCOUNTPRIMARYATTRIBUTE'])){
+      $this->current['ACCOUNTPRIMARYATTRIBUTE']= "cn";
     }
     if (!isset($this->current['MINID'])){
       $this->current['MINID']= 100;
@@ -986,7 +986,7 @@ class config  {
    */
   function check_session_lifetime()
   {
-    $cfg_lifetime = $this->data['MAIN']['SESSION_LIFETIME'];
+    $cfg_lifetime = $this->data['MAIN']['SESSIONLIFETIME'];
     $ini_lifetime = ini_get('session.gc_maxlifetime');
     $deb_system   = file_exists('/etc/debian_version');
     return(!($deb_system && ($ini_lifetime < $cfg_lifetime)));  

diff --git a/gosa-core/include/class_ldap.inc b/gosa-core/include/class_ldap.inc
index a83343709f0152189fd65343d6e4a6853ee7f23f..19d8c1d521d1fe2337be485a91398cc5416cb1e8 100644 (file)
--- a/gosa-core/include/class_ldap.inc
+++ b/gosa-core/include/class_ldap.inc
@@ -60,8 +60,8 @@ class LDAP{
     $this->hostname=$hostname;
 
     /* Check if MAX_LDAP_QUERY_TIME is defined */ 
-    if(is_object($config) && $config->get_cfg_value("max_ldap_query_time") != ""){
-      $str = $config->get_cfg_value("max_ldap_query_time");
+    if(is_object($config) && $config->get_cfg_value("ldapMaxQueryTime") != ""){
+      $str = $config->get_cfg_value("ldapMaxQueryTime");
       $this->max_ldap_query_time = (float)($str);
     }
 

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index 29f995cc7b553068ddb407dd09b34470a4089a11..f58ed2a2e60ab73da2d552bd8bbf1711abc85f30 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -193,8 +193,8 @@ function get_browser_language()
   }
 
   /* Check for global language settings in gosa.conf */
-  if (isset ($config) && $config->get_cfg_value('lang') != ""){
-    $lang = $config->get_cfg_value('lang');
+  if (isset ($config) && $config->get_cfg_value('language') != ""){
+    $lang = $config->get_cfg_value('language');
     if(!preg_match("/utf/i",$lang)){
       $lang .= ".UTF-8";
     }
@@ -1215,7 +1215,7 @@ function get_ou($name)
 
 function get_people_ou()
 {
-  return (get_ou("PEOPLE"));
+  return (get_ou("USERRDN"));
 }
 
 
@@ -2593,7 +2593,7 @@ function generate_smb_nt_hash($password)
       $hash= "";
     }
   } else {
-         $tmp= $config->get_cfg_value('smbhash')." ".escapeshellarg($password);
+         $tmp= $config->get_cfg_value('sambaHashHook')." ".escapeshellarg($password);
          @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__, $tmp, "Execute");
 
          exec($tmp, $ar);
@@ -2632,7 +2632,7 @@ function getEntryCSN($dn)
   }
 
   /* Get attribute that we should use as serial number */
-  $attr= $config->get_cfg_value("uniq_identifier");
+  $attr= $config->get_cfg_value("modificationDetectionAttribute");
   if($attr != ""){
     $ldap = $config->get_ldap_link();
     $ldap->cat($dn,array($attr));

diff --git a/gosa-core/plugins/admin/groups/class_groupManagement.inc b/gosa-core/plugins/admin/groups/class_groupManagement.inc
index 58db24e8ded83f06cc1c2f4eebcd566b5ea2bcd0..346a15f394c8d2b92f9dcf2b1898ae7a11890e2a 100644 (file)
--- a/gosa-core/plugins/admin/groups/class_groupManagement.inc
+++ b/gosa-core/plugins/admin/groups/class_groupManagement.inc
@@ -50,7 +50,7 @@ class groupManagement extends plugin
     
     /* Detect if we have to display the primary group checkbox */
     $tmp = "";
-    if ($this->config->get_cfg_value("noprimarygroup") == "true"){
+    if ($this->config->get_cfg_value("primaryGroupFilter") == "false"){
       $this->ShowPrimaryCheckBox = false;
     } else {
       $this->ShowPrimaryCheckBox = true;

diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index 577744197c17e8c6726189b5de06c04c256b45e8..8e4b046f1fb907dac3a128a2672a5cce1539118c 100644 (file)
--- a/gosa-core/plugins/personal/generic/class_user.inc
+++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -1140,7 +1140,7 @@ class user extends plugin
     $this->cn= $pt.$this->givenName." ".$this->sn;
 
     /* Permissions for that base? */
-    if ($this->config->get_cfg_value("dnmode") == "uid"){
+    if ($this->config->get_cfg_value("accountPrimaryAttribute") == "uid"){
       $this->new_dn= 'uid='.$this->uid.','.get_people_ou().$this->base;
     } else {
       /* Don't touch dn, if cn hasn't changed */
@@ -1211,7 +1211,7 @@ class user extends plugin
       if ($this->uid == ""){
         $message[]= msgPool::required(_("Login"));
       }
-      if ($this->config->get_cfg_value("dnmode") != "uid"){
+      if ($this->config->get_cfg_value("accountPrimaryAttribute") != "uid"){
         $ldap->cat($this->new_dn);
         if ($ldap->count() != 0 && $this->dn != $this->new_dn && $this->dn == 'new'){
           $message[]= msgPool::duplicated(_("Name"));

diff --git a/gosa-core/plugins/personal/posix/class_posixAccount.inc b/gosa-core/plugins/personal/posix/class_posixAccount.inc
index 139f6973243639c74cbd635eb52d7024147f6492..efb332422e0b8c984af58fcce11db82f7c20594a 100644 (file)
--- a/gosa-core/plugins/personal/posix/class_posixAccount.inc
+++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc
@@ -953,7 +953,7 @@ class posixAccount extends plugin
 
       /* Create group if it doesn't exist */
       if ($ldap->count() == 0){
-        $groupdn= preg_replace ('/^'.$this->config->get_cfg_value("dnmode").'=[^,]+,'.get_people_ou().'/i', 'cn='.$this->uid.','.get_groups_ou(), $this->dn);
+        $groupdn= preg_replace ('/^'.$this->config->get_cfg_value("accountPrimaryAttribute").'=[^,]+,'.get_people_ou().'/i', 'cn='.$this->uid.','.get_groups_ou(), $this->dn);
 
         $g= new group($this->config, $groupdn);
         $g->cn= $this->uid;

diff --git a/gosa-core/setup/setup_config3.tpl b/gosa-core/setup/setup_config3.tpl
index 7f66fe8b532bdcd37b8c205c2f8f79de6f3d6637..8e836e9a12410a29929609e2d6fa643bb5bfcc6f 100644 (file)
--- a/gosa-core/setup/setup_config3.tpl
+++ b/gosa-core/setup/setup_config3.tpl
@@ -3,7 +3,7 @@
 
     <div class='step4_container'>
         <div class='step4_name'>
-            {t}Disable primary group filter{/t}
+            {t}Enable primary group filter{/t}
         </div>
         <div class='step4_value'>
        

diff --git a/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc
index fdd8f3809f08d6003fce63b8f9241902326b2ffd..46aa1f1f8b472dda1934e45113d3b409b57a2fcb 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc
@@ -501,8 +501,8 @@ class printgeneric extends plugin
 
     /* Parse selected ppd file */
     $config = session::get('config');
-    if ($config->get_cfg_value("ppd_path") != ""){
-      $path = $config->get_cfg_value("ppd_path");
+    if ($config->get_cfg_value("ppdPath") != ""){
+      $path = $config->get_cfg_value("ppdPath");
       if(!preg_match("/\/$/",$path)){
         $path = $path."/";
       }

diff --git a/gosa-plugins/goto/admin/systems/ppd/class_printerPPDDialog.inc b/gosa-plugins/goto/admin/systems/ppd/class_printerPPDDialog.inc
index e2875f57ab05907fd1f8bc1286d9422d5c97f52c..244129c6f861cbb66d926e72c24e3878fe8e0414 100644 (file)
--- a/gosa-plugins/goto/admin/systems/ppd/class_printerPPDDialog.inc
+++ b/gosa-plugins/goto/admin/systems/ppd/class_printerPPDDialog.inc
@@ -35,8 +35,8 @@ class printerPPDDialog extends plugin
 
     /* Get PPD path and remove double //, and add trailing /  */
     $config = session::get('config');
-    if($config->get_cfg_value("ppd_path") != ""){
-      $this->pathToPPD = $config->get_cfg_value("ppd_path");
+    if($config->get_cfg_value("ppdPath") != ""){
+      $this->pathToPPD = $config->get_cfg_value("ppdPath");
       $this->pathToPPD= preg_replace("/\/\//", "/", $this->pathToPPD);
       if(!preg_match("/\/$/",$this->pathToPPD)){
         $this->pathToPPD = $this->pathToPPD."/";

diff --git a/gosa-plugins/openxchange/README.openxchange b/gosa-plugins/openxchange/README.openxchange
index 52effd84e0b0d0dd7350e1b81c03a7c2c61360b0..ce6eabb5e19d133176b72321b66dc3ab1c7a38d3 100644 (file)
--- a/gosa-plugins/openxchange/README.openxchange
+++ b/gosa-plugins/openxchange/README.openxchange
@@ -46,7 +46,7 @@ my $ldap_userBase = 'ou=people,';
 - Put the Base in ldap.conf (/usr/local/openxchange/etc/groupware/ldap.conf)
 BASE    dc=example,dc=org
 
-- If you are using as GOsa dnmode "uid", You must change in ldap.properties 
+- If you are using as GOsa accountPrimaryAttribute "uid", You must change in ldap.properties 
 (/usr/local/openxchange/etc/groupware/ldap.properties):
 
 
@@ -68,7 +68,7 @@ com.openexchange.groupware.ldap.userBaseDN=ou\u003Dpeople
 
 
 
-- If you are using as GOsa dnmode "cn", the ldap.properties  
+- If you are using as GOsa accountPrimaryAttribute "cn", the ldap.properties  
 (/usr/local/openxchange/etc/groupware/ldap.properties) 
 configuration of open-xchange must be like this:
 

diff --git a/gosa-plugins/openxchange/personal/connectivity/openxchange/class_oxchangeAccount.inc b/gosa-plugins/openxchange/personal/connectivity/openxchange/class_oxchangeAccount.inc
index 461ed7f442a77f2a771e5b780195df689a0859f8..f9f1337aad8521244c48076b9ae2ac1d00f7c3c7 100644 (file)
--- a/gosa-plugins/openxchange/personal/connectivity/openxchange/class_oxchangeAccount.inc
+++ b/gosa-plugins/openxchange/personal/connectivity/openxchange/class_oxchangeAccount.inc
@@ -59,7 +59,7 @@ class oxchangeAccount extends plugin
       $this->uid = $this->attrs['uid'][0];
     }
 
-    $this->dnmode= $this->config->get_cfg_value("dnmode");
+    $this->dnmode= $this->config->get_cfg_value("accountPrimaryAttribute");
     if(isset($this->attrs[$this->dnmode][0])){
       $this->dnModeValue = $this->attrs[$this->dnmode][0];
     }

diff --git a/gosa-plugins/systems/admin/systems/tabs_server.inc b/gosa-plugins/systems/admin/systems/tabs_server.inc
index bf1dd4134363b55befb81a31343a0f2f466952d2..0df20e09ff03da36055aadbcf1f16d2521ea90a9 100644 (file)
--- a/gosa-plugins/systems/admin/systems/tabs_server.inc
+++ b/gosa-plugins/systems/admin/systems/tabs_server.inc
@@ -99,7 +99,7 @@ class servtabs extends tabs
 
     /* cn is not case sensitive for ldap, but for php it is!! */
     if($baseobject->orig_dn != "new"){
-      if($this->config->get_cfg_value("dnmode") == "cn"){
+      if($this->config->get_cfg_value("accountPrimaryAttribute") == "cn"){
         if (strtolower($baseobject->orig_dn) != (strtolower($this->dn))){
           $baseobject->recursive_move($baseobject->orig_dn, $this->dn);
         }