From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 14 Jan 2011 13:59:01 +0000 (+0000)
Subject: Added netatalk patch
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=293fd4d8f9919ddd906d96429e8c7cc515763bde;p=gosa.git

Added netatalk patch


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

diff --git a/gosa-plugins/netatalk/personal/netatalk/class_netatalk.inc b/gosa-plugins/netatalk/personal/netatalk/class_netatalk.inc
index 1329d1355..6b4cfcbe8 100644
--- a/gosa-plugins/netatalk/personal/netatalk/class_netatalk.inc
+++ b/gosa-plugins/netatalk/personal/netatalk/class_netatalk.inc
@@ -102,6 +102,10 @@ class netatalk extends plugin {
     $this->get_netatalk_shares(); 
     $this->apple_user_share = $this->selectedshare;
 
+    if(!$this->is_account){
+        $this->apple_user_share = key($this->shares);
+    }
+
     /* Save initial account state */
     $this->initially_was_account = $this->is_account;
   }
@@ -376,6 +380,34 @@ class netatalk extends plugin {
           ));
   }
 
+  function adapt_from_template($dn, $skip= array())
+  {
+    /* As the 'apple-user-homeDirectory' LDAP attribute is stored as
+     * 'apple_user_homeDirectory' internally by GOsa (to avoid problem with
+     * dashes as variable names), we need to add the dashed version to
+     * $this->attributes so that the adapt_from_template function in the plugin
+     * class will find the dashed LDAP attribute and substitute possibly
+     * placeholders like %uid. We remove the dashed version of
+     * 'apple_user_homeDirectory' from the attributes again afterwards. */
+    array_push($this->attributes, "apple-user-homeDirectory");
+    plugin::adapt_from_template($dn, $skip);
+    array_pop($this->attributes);
+  
+    /* Loop through the available shares and find out which is the share from
+     * 'apple-user-homeDirectory'. Remove its host and directory (as well as
+     * the default 'mountDirectory' prefix) to get 'apple_user_homepath_raw'
+     * and store that share as 'selectedshare' so that it gets displayed by
+     * default in the netatalk tab. */
+    foreach($this->shares as $share) {
+      $apple_user_homepath = $this->mountDirectory."/".
+			$this->shares_settings[$share]["host"].
+			$this->shares_settings[$share]["dir"]."/";
+      if (preg_match("#$apple_user_homepath#", $this->{'apple-user-homeDirectory'})) {
+        $this->apple_user_homepath_raw =  preg_replace("#$apple_user_homepath#", "", $this->{'apple-user-homeDirectory'});
+        $this->selectedshare = $share;
+      }
+    }
+  }   
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: