Removed mail uattrib from setup.

-Not used anymore.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13279 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/setup/class_setupStep_Config2.inc b/gosa-core/setup/class_setupStep_Config2.inc
index 9f8397119834a6660042295c834784801d7ce3d5..7a9a1cb8e02edc4dc7ff8637b3d6d2ca0b5657ac 100644 (file)
--- a/gosa-core/setup/class_setupStep_Config2.inc
+++ b/gosa-core/setup/class_setupStep_Config2.inc
@@ -272,11 +272,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 +310,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;
-          }
         }
       }
     }

diff --git a/gosa-core/setup/setup_config2.tpl b/gosa-core/setup/setup_config2.tpl
index 3ed7daec9ac28659f395fbacb8b60fcb0d44bf86..b6d806b310c3d217ba95285573a14609bf10c2cd 100644 (file)
--- a/gosa-core/setup/setup_config2.tpl
+++ b/gosa-core/setup/setup_config2.tpl
@@ -200,7 +200,7 @@
             <select name="mail" size="1" title="" onChange="document.mainform.submit();">
                 <option  value="disabled">{t}disabled{/t}</option>
                 {foreach from=$mail_methods item=item}
-                    <option value="{$item.name}" {if $mail == $item.name} selected {/if}>{$item.name}&nbsp;({$item.uattrib})</option>
+                    <option value="{$item.name}" {if $mail == $item.name} selected {/if}>{$item.name}</option>
                 {/foreach}
             </select>
         </div>