Fixed error messages for pseudo attributes

- Diese und die folgenden Zeilen werden ignoriert --

M    plugins/personal/netatalk/class_netatalk.inc
M    include/class_plugin.inc
M    Changelog

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

diff --git a/Changelog b/Changelog
index b571dab986d5d6c3b1592231468619775d9ea4eb..db33626741d6fa946c06c324d2402209655d42d6 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -5,6 +5,7 @@ GOsa2 changelog
   - Fixes various issues with setup.php
   - Avoid tab lables to have line feeds
   - Activated missing checks for IP and MAC
+  - Fixed copy'n paste errors for netatalk
 
 * gosa 2.5.5
   - Added remove method for shared folder in kolab mode

diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index 8be727a5b31de73ebad4b90d92969e18beae44eb..c41ac56fa96d78e279ab205772067eec37dfd660 100644 (file)
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -864,7 +864,9 @@ class plugin
     }
     $todo[] = "is_account";
     foreach($todo as $var){
-      $this->$var = $source->$var;
+      if (isset($source->$var)){
+        $this->$var= $source->$var;
+      }
     }
   }
 

diff --git a/plugins/personal/netatalk/class_netatalk.inc b/plugins/personal/netatalk/class_netatalk.inc
index 9af5e13f1d482128be93356f067b67784de57036..9df9eeb19f47bdea8f6a3f29ac11b2cc3390211a 100644 (file)
--- a/plugins/personal/netatalk/class_netatalk.inc
+++ b/plugins/personal/netatalk/class_netatalk.inc
@@ -55,6 +55,7 @@ class netatalk extends plugin {
   
   /* Attributes to save to LDAP */
   var $attributes = array ("apple-user-homeurl", "apple-user-homeDirectory");
+  var $CopyPasteVars= array("apple_user_homeurl", "apple_user_homeDirectory");
 
   /* Attributes to use in smarty template */
   var $smarty_attributes = array ("apple_user_homepath_raw", "shares", "selectedshare");