diff --git a/gosa-core/setup/class_setupStep_Config2.inc b/gosa-core/setup/class_setupStep_Config2.inc
index 9f8397119834a6660042295c834784801d7ce3d5..2ec4ede3349fdad879f48aaad3b8508a57c23610 100644 (file)
"vacationdir_active" => FALSE);
var $generic_settings = array( "enableCopyPaste" => false,
- "enableDNS" => false,
- "enableDHCP" => false,
"wws_ou" => "ou=winstations",
"wws_ou_active" => FALSE,
"snapshot_active" => FALSE,
"samba_rid_active" => FALSE);
var $sambaDomain_found = FALSE;
- var $use_netatalk = FALSE;
- var $enableFAI_management = FALSE;
- var $enableMimeType = FALSE;
-
var $timezone = "Europe/Berlin";
var $timezones = array();
- var $attributes = array("mail_attrib","governmentmode","sambaidmapping","cyrusunixstyle","mail","use_netatalk","enableFAI_management","timezone","enableMimeType");
+ var $attributes = array("mail_attrib","governmentmode","sambaidmapping","cyrusunixstyle","mail","timezone");
var $called = FALSE;
function Step_Config2()
$this->samba_settings['samba_rid_active'] = TRUE;
}
- /* Check if we can enable netatalk plugin */
- $tmp = $ldap->get_objectclasses();
- if(is_array($tmp) && isset($tmp['apple-user'])) {
- $this->use_netatalk = TRUE;
- }
-
- /* Check the FAI schema is used */
- if(is_array($tmp) && isset($tmp['FAIclass'])){
-# $this->enableFAI_management = TRUE;
- }
-
- /* Check the MimeType schema is used */
- if(is_array($tmp) && isset($tmp['gotoMimeType'])){
- $this->enableMimeType = TRUE;
- }
-
- if(is_array($tmp) && isset($tmp['dhcpClass'])){
- $this->generic_settings['enableDHCP'] = TRUE;
- }
-
- if(is_array($tmp) && isset($tmp['dNSZone'])){
- $this->generic_settings['enableDNS'] = TRUE;
- }
-
$this->called = TRUE;
}
if(isset($_POST['enableCopyPaste'])){
$this->generic_settings['enableCopyPaste'] = get_post('enableCopyPaste');
}
- if(isset($_POST['enableDNS'])){
- $this->generic_settings['enableDNS'] = get_post('enableDNS');
- }
- if(isset($_POST['enableDHCP'])){
- $this->generic_settings['enableDHCP'] = get_post('enableDHCP');
- }
if(isset($_POST['wws_ou_active'])){
$this->generic_settings['wws_ou_active'] = TRUE;
$this->samba_settings['samba_sid_active'] = TRUE;
$this->samba_settings['samba_rid_active'] = TRUE;
}
-
- /* Reload mail naming attribute */
- if($old_mail != $this->mail && isset($this->mail_methods[$this->mail]['uattrib'])){
- $this->mail_attrib = $this->mail_methods[$this->mail]['uattrib'];
- }
}
$tmp = $this->check();
if(!class_available("mailMethod")){
return(array());
}
-
- $default_uattrib = "";
- $m_class_vars = get_class_vars("mailMethod");
- if(isset($m_class_vars['uattrib'])){
- $default_uattrib = $m_class_vars['uattrib'];
- }
-
+ $methods = array();
foreach($class_mapping as $name => $file){
- if(preg_match("/^mailMethod[a-z]*$/i",$name)){
+ if(preg_match("/^mailMethod.*$/i",$name)){
$name = preg_replace("/^mailMethod/","",$name);
if(!empty($name)){
$methods[$name]['name'] = $name;
- $m_class_vars = get_class_vars("mailMethod".$methods[$name]['name']);
- if(isset($m_class_vars['uattrib'])){
- $methods[$name]['uattrib'] = $m_class_vars['uattrib'];
- }else{
- $methods[$name]['uattrib'] = $default_uattrib;
- }
}
}
}