From: cajus Date: Tue, 16 Sep 2008 10:06:29 +0000 (+0000) Subject: Updated a couple of values X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=06cc53394cf695b3bc663073e526d7d94e4bb2d6;p=gosa.git 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 b662504fd..fc072e156 100644 --- 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 c5869b2c4..8d5ae5d21 100644 --- a/gosa-core/contrib/gosa.conf +++ b/gosa-core/contrib/gosa.conf @@ -495,8 +495,8 @@ 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 6f0b1699f..e9723e0e7 100644 --- 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 55b12943b..f68a48148 100644 --- 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 4df1c769c..43f851190 100644 --- 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 0c395960e..ef555df23 100644 --- 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 e4be820b1..b4d805437 100644 --- 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 ddc26fcf3..481da0523 100644 --- 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 a83343709..19d8c1d52 100644 --- 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 29f995cc7..f58ed2a2e 100644 --- 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 58db24e8d..346a15f39 100644 --- 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 577744197..8e4b046f1 100644 --- 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 139f69732..efb332422 100644 --- 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 7f66fe8b5..8e836e9a1 100644 --- a/gosa-core/setup/setup_config3.tpl +++ b/gosa-core/setup/setup_config3.tpl @@ -3,7 +3,7 @@
- {t}Disable primary group filter{/t} + {t}Enable primary group filter{/t}
diff --git a/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc index fdd8f3809..46aa1f1f8 100644 --- 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 e2875f57a..244129c6f 100644 --- 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 52effd84e..ce6eabb5e 100644 --- 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 461ed7f44..f9f1337aa 100644 --- 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 bf1dd4134..0df20e09f 100644 --- 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); }