X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fsetup%2Fclass_setupStep_Config2.inc;h=1bf1d2ff5c13f3d81c4a7dbced193141a828edfb;hb=7d0eab6bb81d3010130879061ea00542071f5b76;hp=50bfc8e660003c4cc8179365936534c2bc204653;hpb=06d22e2778fe5959b54032cd3d9f2baa2b0138a8;p=gosa.git

diff --git a/gosa-core/setup/class_setupStep_Config2.inc b/gosa-core/setup/class_setupStep_Config2.inc
index 50bfc8e66..1bf1d2ff5 100644
--- a/gosa-core/setup/class_setupStep_Config2.inc
+++ b/gosa-core/setup/class_setupStep_Config2.inc
@@ -24,7 +24,7 @@ class Step_Config2 extends setup_step
 {
   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";
@@ -34,15 +34,13 @@ class Step_Config2 extends setup_step
                              "vacationdir_active" => FALSE);
 
   var $generic_settings  = array( "enableCopyPaste" => false,
-                                  "enableDNS"      => false,
-                                  "enableDHCP"      => false,
                                   "wws_ou"        => "ou=winstations",
                                   "wws_ou_active" => FALSE,
                                   "snapshot_active"     => FALSE,
                                   "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",
@@ -52,14 +50,10 @@ class Step_Config2 extends setup_step
                                   "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()
@@ -116,30 +110,6 @@ class Step_Config2 extends setup_step
         $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;
     }
 
@@ -161,8 +131,7 @@ class Step_Config2 extends setup_step
     $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){
@@ -191,14 +160,7 @@ class Step_Config2 extends setup_step
       }
 
       /* 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'])){
@@ -213,12 +175,6 @@ class Step_Config2 extends setup_step
       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;
@@ -272,11 +228,6 @@ class Step_Config2 extends setup_step
         $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();
@@ -315,24 +266,12 @@ class Step_Config2 extends setup_step
     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;
-          }
         }
       }
     }