Added first test for get_module_permissions

[gosa.git] / include / class_config.inc

diff --git a/include/class_config.inc b/include/class_config.inc
index 82e65d402292352e04ed0e6bd1a807f0f1802346..a60ae8e243ce2ccc5f85fdd7334e7ccf0a810c9f 100644 (file)
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -38,7 +38,7 @@ class config  {
 
   /* Configuration data */
   var $data= array( 'TABS' => array(), 'LOCATIONS' => array(), 'SERVERS' => array(),
-      'MAIN' => array( 'LANGUAGES' => array(), 'FAXFORMATS' => array() ),
+      'MAIN' => array( 'FAXFORMATS' => array() ),
       'MENU' => array(), 'SERVICE' => array());
   var $basedir= "";
 
@@ -143,15 +143,6 @@ class config  {
                   }
                   break;
 
-                  /* Handle language */
-      case 'LANGUAGE':
-                  if ($this->tags[$this->level-2] == 'MAIN'){
-                    /* Add languages */
-                    $this->data['MAIN']['LANGUAGES'][$attrs['NAME']]= 
-                      $attrs['TAG'];
-                  }
-                  break;
-
                   /* Handle faxformat */
       case 'FAXFORMAT':        
                   if ($this->tags[$this->level-2] == 'MAIN'){
@@ -335,6 +326,9 @@ class config  {
     /* Fill imap servers */
     $ldap= $this->get_ldap_link();
     $ldap->cd ($this->current['BASE']);
+    if (!isset($this->current['MAILMETHOD'])){
+       $this->current['MAILMETHOD']= "";
+    }
     if ($this->current['MAILMETHOD'] == ""){
            $ldap->search ("(objectClass=goMailServer)", array('cn'));
            $this->data['SERVERS']['IMAP']= array();