diff --git a/gosa-core/setup/class_setupStep_Config2.inc b/gosa-core/setup/class_setupStep_Config2.inc
index 97a5c02e8c5a2ef58df93fd662936eb505c8a60f..9f8397119834a6660042295c834784801d7ce3d5 100644 (file)
{
var $governmentmode = FALSE;
var $sambaidmapping = FALSE;
- var $header_image = "images/ldapserver.png";
+ var $header_image = "images/setup/server.png";
var $cyrusunixstyle = FALSE;
var $mail = "none";
"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,xmlentities($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;
{
global $class_mapping;
+ /* Check if we have the mail classes/plugins installed */
+ if(!class_available("mailMethod")){
+ return(array());
+ }
+
$default_uattrib = "";
$m_class_vars = get_class_vars("mailMethod");
if(isset($m_class_vars['uattrib'])){