diff --git a/gosa-core/setup/class_setupStep_Config2.inc b/gosa-core/setup/class_setupStep_Config2.inc
index 450fe81e1c20c6ef30dbb700f57526944166cfba..89103e75b082f0ac404dd3bd16d54c6997d7efb2 100644 (file)
"snapshot_base" => "ou=snapshots,%base%",
"snapshot_user" => "%admin%",
"snapshot_password" => "",
+ "logging" => "syslog,mysql",
"snapshot_server" => "%connection%");
var $samba_settings = array( "samba_sid" => "0-815-4711",
}
$smarty = get_smarty();
- $smarty->assign("sambaDomain_found",$this->sambaDomain_found);
- $smarty->assign("generic_settings",$this->generic_settings);
- $smarty->assign("mail_settings",$this->mail_settings);
- $smarty->assign("mail_methods",$this->mail_methods);
- $smarty->assign("samba_settings",$this->samba_settings);
+ $smarty->assign("sambaDomain_found", $this->sambaDomain_found);
+ $smarty->assign("generic_settings", reverse_html_entities($this->generic_settings));
+ $smarty->assign("mail_settings", reverse_html_entities($this->mail_settings));
+ $smarty->assign("mail_methods", reverse_html_entities($this->mail_methods));
+ $smarty->assign("samba_settings", reverse_html_entities($this->samba_settings));
+
+ $smarty->assign("logging_mysql" ,preg_match("/mysql/",$this->generic_settings['logging']));
+ $smarty->assign("logging_syslog",preg_match("/syslog/",$this->generic_settings['logging']));
+
$smarty->assign("bool",array(FALSE => _("No"), TRUE => _("Yes")));
foreach($this->attributes as $attr){
- $smarty->assign($attr,$this->$attr);
+ $smarty->assign($attr,reverse_html_entities($this->$attr));
}
$smarty->assign("timezone" ,$this->timezone);
$smarty->assign("timezones" ,$this->timezones);
}
}
+ /* Get logging */
+ $logging = "";
+ if(isset($_POST['logging_syslog'])){
+ $logging.= "syslog,";
+ }
+ if(isset($_POST['logging_mysql'])){
+ $logging.= "mysql,";
+ }
+ $this->generic_settings['logging'] = trim($logging,",");
+
/* Mail settings */
if(isset($_POST['vacationdir_active'])){
$this->mail_settings['vacationdir_active'] = TRUE;