a

a
a
a
a
a
a

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index e63c5a7d9fae4379eab8c08750e97b42d465bb23..5c2f36d46da6efd7d8da4190f3721a66c9930eeb 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -15,8 +15,15 @@
                                path="plugins/personal/mail" />
                        <plugin acl="default" class="sambaAccount" icon="samba.png"
                                path="plugins/personal/samba" />
+{if $cv.use_netatalk}
                        <plugin acl="default" class="netatalk" icon="netatalk.png"
                                path="plugins/personal/netatalk" />
+{else}
+<!--
+                       <plugin acl="default" class="netatalk" icon="netatalk.png"
+                               path="plugins/personal/netatalk" />
+-->
+{/if}
                        <plugin acl="default" class="connectivity" icon="proxy.png"
                                path="plugins/personal/connectivity" />
                        <plugin acl="default" class="gofaxAccount" icon="fax.png"
@@ -93,7 +100,13 @@
                <tab class="environment" name="Environment" />
                <tab class="mailAccount" name="Mail" />
                <tab class="sambaAccount" name="Samba" />
+{if $cv.use_netatalk}
                <tab class="netatalk" name="Netatalk" />
+{else}
+<!--
+               <tab class="netatalk" name="Netatalk" />
+-->
+{/if}
                <tab class="connectivity" name="Connectivity" />
                <tab class="gofaxAccount" name="Fax" />
                <tab class="phoneAccount" name="Phone" />

diff --git a/setup/class_setupStep_Config2.inc b/setup/class_setupStep_Config2.inc
index 1e3bdea5e104c1a59964ab39161707c8ec4b1a97..2e0d333f1bd5f7045f8912f125896ba52aeb99f9 100644 (file)
--- a/setup/class_setupStep_Config2.inc
+++ b/setup/class_setupStep_Config2.inc
@@ -43,11 +43,11 @@ class Step_Config2 extends setup_step
                                   "samba_rid_active" => FALSE); 
 
   var $sambaDomain_found = FALSE;
+  var $use_netatalk = FALSE;
 
-  var $attributes = array("governmentmode","sambaidmapping","cyrusunixstyle","mail");
+  var $attributes = array("governmentmode","sambaidmapping","cyrusunixstyle","mail","use_netatalk");
   var $called = FALSE;
 
-
   function Step_Config2()
   {
     $this->update_strings();
@@ -100,7 +100,12 @@ class Step_Config2 extends setup_step
         $this->samba_settings['samba_sid_active'] = TRUE;
         $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;
+      }
       $this->called = TRUE;
     }
 

diff --git a/setup/setup_config2.tpl b/setup/setup_config2.tpl
index c3925f22aeeffcb35ac55635816c19dabd715c2c..d8d09e76ac97163b22db69d770f4d94a29c19be0 100644 (file)
--- a/setup/setup_config2.tpl
+++ b/setup/setup_config2.tpl
@@ -81,6 +81,17 @@
         </div>
     </div>
 
+       <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Enable user netatalk plugin{/t}
+        </div>
+        <div class='step4_value'>
+            <select name="use_netatalk" size="1" title="">
+                {html_options options=$bool selected=$use_netatalk}
+            </select>
+        </div>
+    </div>
+
     <div class='step4_container'>
         <div class='step4_name'>
             {t}Government mode{/t}