diff --git a/gosa-core/setup/class_setupStep_Config2.inc b/gosa-core/setup/class_setupStep_Config2.inc
index bd01628df39d531ae33c6f43f3e77ba2b3cd802d..1bf1d2ff5c13f3d81c4a7dbced193141a828edfb 100644 (file)
var $mail = "none";
var $mail_attrib = "";
var $mail_methods = array();
var $mail = "none";
var $mail_attrib = "";
var $mail_methods = array();
- var $mail_settings = array("vacationdir" => "/etc/gosa/mail/vacation_templates/",
+ var $mail_settings = array("vacationdir" => "/etc/gosa/vacation",
"vacationdir_active" => FALSE);
var $generic_settings = array( "enableCopyPaste" => false,
"vacationdir_active" => FALSE);
var $generic_settings = array( "enableCopyPaste" => false,
"snapshot_base" => "ou=snapshots,%base%",
"snapshot_user" => "%admin%",
"snapshot_password" => "",
"snapshot_base" => "ou=snapshots,%base%",
"snapshot_user" => "%admin%",
"snapshot_password" => "",
- "logging" => "syslog,mysql",
+ "logging" => TRUE,
"snapshot_server" => "%connection%");
var $samba_settings = array( "samba_sid" => "0-815-4711",
"snapshot_server" => "%connection%");
var $samba_settings = array( "samba_sid" => "0-815-4711",
$smarty->assign("mail_methods", reverse_html_entities($this->mail_methods));
$smarty->assign("samba_settings", reverse_html_entities($this->samba_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("logging",$this->generic_settings['logging']);
$smarty->assign("bool",array(FALSE => _("No"), TRUE => _("Yes")));
foreach($this->attributes as $attr){
$smarty->assign("bool",array(FALSE => _("No"), TRUE => _("Yes")));
foreach($this->attributes as $attr){
}
/* Get logging */
}
/* Get logging */
- $logging = "";
- if(isset($_POST['logging_syslog'])){
- $logging.= "syslog,";
- }
- if(isset($_POST['logging_mysql'])){
- $logging.= "mysql,";
- }
- $this->generic_settings['logging'] = trim($logging,",");
+ $this->generic_settings['logging'] = isset($_POST['logging']);
/* Mail settings */
if(isset($_POST['vacationdir_active'])){
/* Mail settings */
if(isset($_POST['vacationdir_active'])){