index 4354fdaea3094d60b6bf72a55b31b7e24029ee0c..d0b5cc71e9bf35ac68c9994fb52877a7892f4571 100644 (file)
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 */
}
/* 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";
}
global $config, $BASE_DIR;
/* Set theme */
- $theme= $config->get_cfg_value("theme", "default");
+ if (isset ($config)){
+ $theme= $config->get_cfg_value("theme", "default");
+ } else {
+ $theme= "default";
+ }
/* Return path for empty filename */
if ($filename == ''){
}
+function array_remove_entries_ics($needles, $haystack)
+{
+ $tmp= array();
+
+ /* Loop through entries to be removed */
+ foreach ($haystack as $entry){
+ if (!in_array_ics($entry, $needles)){
+ $tmp[]= $entry;
+ }
+ }
+
+ return ($tmp);
+}
+
+
function gosa_array_merge($ar1,$ar2)
{
if(!is_array($ar1) || !is_array($ar2)){
/* Sadly we've no proper return values here. Use the error message instead. */
if (!$ldap->success()){
- echo sprintf(_("FATAL: Error when connecting the LDAP. Server said '%s'."), $ldap->get_error());
+ msg_dialog::display(_("Fatal error"),
+ sprintf(_("FATAL: Error when connecting the LDAP. Server said '%s'."), $ldap->get_error()),
+ FATAL_ERROR_DIALOG);
exit();
}
/* Look for entry or realm */
$ldap= $config->get_ldap_link();
if (!$ldap->success()){
- msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), "", LDAP_AUTH, ERROR_DIALOG));
- $smarty= get_smarty();
- $smarty->display(get_template_path('headers.tpl'));
- echo "<body>".session::get('errors')."</body></html>";
+ msg_dialog::display(_("LDAP error"),
+ msgPool::ldaperror($ldap->get_error(), "", LDAP_AUTH)."<br><br>".session::get('errors'),
+ FATAL_ERROR_DIALOG);
exit();
}
$ldap->search("(&(objectClass=gosaAccount)(|(uid=$username)(userPassword={$mode}$username)))", array("uid"));
/* Look for entry or realm */
$ldap= $config->get_ldap_link();
if (!$ldap->success()){
- msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), "", LDAP_AUTH, FATAL_ERROR_DIALOG));
- $smarty= get_smarty();
- $smarty->display(get_template_path('headers.tpl'));
- echo "<body>".session::get('errors')."</body></html>";
+ msg_dialog::display(_("LDAP error"),
+ msgPool::ldaperror($ldap->get_error(), "", LDAP_AUTH)."<br><br>".session::get('errors'),
+ FATAL_ERROR_DIALOG);
exit();
}
$ldap->search("(&(objectClass=gosaAccount)(uid=$username))", array("uid"));
/* look through the entire ldap */
$ldap = $config->get_ldap_link();
if (!$ldap->success()){
- msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error()), FATAL_ERROR_DIALOG);
- $smarty= get_smarty();
- $smarty->display(get_template_path('headers.tpl'));
- echo "<body>".session::get('errors')."</body></html>";
+ msg_dialog::display(_("LDAP error"),
+ msgPool::ldaperror($ldap->get_error(), "", LDAP_AUTH)."<br><br>".session::get('errors'),
+ FATAL_ERROR_DIALOG);
exit();
}
$ldap->cd($config->current['BASE']);
{
global $config;
+ $name= strtolower($name);
+
$map = array(
"ogroupou" => "ou=groups,",
"applicationou" => "ou=apps,",
"mimetypeou" => "ou=mime,");
/* Preset ou... */
- if ($config->get_cfg_value($name) != ""){
+ if ($config->get_cfg_value($name, "_not_set_") != "_not_set_"){
$ou= $config->get_cfg_value($name);
} elseif (isset($map[$name])) {
$ou = $map[$name];
function get_people_ou()
{
- return (get_ou("PEOPLE"));
+ return (get_ou("USERRDN"));
}
function get_groups_ou()
{
- return (get_ou("GROUPS"));
+ return (get_ou("GROUPRDN"));
}
{
global $config;
- return ($config->get_cfg_value("strict") == "true");
+ if (isset($config)){
+ return ($config->get_cfg_value("strict") == "true");
+ }
+ return (TRUE);
}
$progress = (int)(($percentage /100)*$width);
- /* Abort printing out percentage, if divs are to small */
-
-
/* If theres a better solution for this, use it... */
- $str = "
- <div style=\" width:".($width)."px;
- height:".($height)."px;
- background-color:#000000;
-padding:1px;\">
-
- <div style=\" width:".($width)."px;
- background-color:#$bgcolor;
-height:".($height)."px;\">
-
- <div style=\" width:".$progress."px;
-height:".$height."px;
- background-color:#".$color2.$color2.$color."; \">";
-
+ $str = "\n <div style=\" width:".($width)."px; ";
+ $str.= "\n height:".($height)."px; ";
+ $str.= "\n background-color:#000000; ";
+ $str.= "\n padding:1px;\" > ";
+
+ $str.= "\n <div style=\" width:".($width)."px; ";
+ $str.= "\n background-color:#$bgcolor; ";
+ $str.= "\n height:".($height)."px;\" > ";
+
+ if(($height >10)&&($showvalue)){
+ $str.= "\n <font style=\"font-size:".($height-2)."px; ";
+ $str.= "\n color:#FF0000; align:middle; ";
+ $str.= "\n padding-left:".((int)(($width*0.4)))."px; \"> ";
+ $str.= "\n <b>".$percentage."%</b> ";
+ $str.= "\n </font> ";
+ }
+
+ $str.= "\n <div style=\" width:".$progress."px; ";
+ $str.= "\n height:".$height."px; ";
+ $str.= "\n background-color:#".$color2.$color2.$color."; \" >";
+ $str.= "\n </div>";
+ $str.= "\n </div>";
+ $str.= "\n </div>";
- if(($height >10)&&($showvalue)){
- $str.= "<font style=\"font-size:".($height-2)."px;color:#FF0000;align:middle;padding-left:".((int)(($width*0.4)))."px;\">
- <b>".$percentage."%</b>
- </font>";
- }
-
- $str.= "</div></div></div>";
-
- return($str);
+ return($str);
}
return ($output[0]);
} else {
msg_dialog::display(_("Warning"), _("'base_hook' is not available. Using default base!"), WARNING_DIALOG);
- return ($config->get_cfg_value("uidbase"));
+ return ($config->get_cfg_value("uidNumberBase"));
}
} else {
msg_dialog::display(_("Warning"), _("'base_hook' is not available. Using default base!"), WARNING_DIALOG);
- return ($config->get_cfg_value("uidbase"));
+ return ($config->get_cfg_value("uidNumberBase"));
}
} else {
msg_dialog::display(_("Warning"), _("'base_hook' is not available. Using default base!"), WARNING_DIALOG);
- return ($config->get_cfg_value("uidbase"));
+ return ($config->get_cfg_value("uidNumberBase"));
}
}
$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);
}
/* 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));
$tmp= array();
foreach ($attrs['objectClass'] as $oc) {
foreach ($list as $class){
- if ($oc != $class){
+ if (strtolower($oc) != strtolower($class)){
$tmp[]= $oc;
}
}