X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Ffunctions.inc;h=f58ed2a2e60ab73da2d552bd8bbf1711abc85f30;hb=06cc53394cf695b3bc663073e526d7d94e4bb2d6;hp=b9bbd8a1b47d2159b9ced977549ffdf8951e804e;hpb=7767c7cd8677eb07a1125fdfdc5c72917246ca2a;p=gosa.git
diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index b9bbd8a1b..f58ed2a2e 100644
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -86,6 +86,7 @@ define ("DEBUG_POST", 16);
define ("DEBUG_SESSION",32);
define ("DEBUG_CONFIG", 64);
define ("DEBUG_ACL", 128);
+define ("DEBUG_SI", 256);
/* Rewrite german 'umlauts' and spanish 'accents'
to get better results */
@@ -192,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";
}
@@ -404,7 +405,7 @@ function ldap_login_user_htaccess ($username)
if (!$ldap->success()){
msg_dialog::display(_("LDAP error"),
msgPool::ldaperror($ldap->get_error(), "", LDAP_AUTH)."
".session::get('errors'),
- FATAL_ERROR_DIALOG));
+ FATAL_ERROR_DIALOG);
exit();
}
$ldap->search("(&(objectClass=gosaAccount)(uid=$username))", array("uid"));
@@ -441,7 +442,7 @@ function ldap_login_user ($username, $password)
if (!$ldap->success()){
msg_dialog::display(_("LDAP error"),
msgPool::ldaperror($ldap->get_error(), "", LDAP_AUTH)."
".session::get('errors'),
- FATAL_ERROR_DIALOG));
+ FATAL_ERROR_DIALOG);
exit();
}
$ldap->cd($config->current['BASE']);
@@ -1214,7 +1215,7 @@ function get_ou($name)
function get_people_ou()
{
- return (get_ou("PEOPLE"));
+ return (get_ou("USERRDN"));
}
@@ -1250,7 +1251,10 @@ function strict_uid_mode()
{
global $config;
- return ($config->get_cfg_value("strict") == "true");
+ if (isset($config)){
+ return ($config->get_cfg_value("strict") == "true");
+ }
+ return (TRUE);
}
@@ -2589,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);
@@ -2628,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));