Updated Edit multiple, base select

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

diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index 63f9b545ad2f0f4f5a9aa3f9157a46e262e54ffb..ba6943ce855a75cabe0de911721ec31e8c914224 100644 (file)
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -591,7 +591,11 @@ class user extends plugin
     $smarty->assign("userPicture_is_readable",   $this->acl_is_readable("userPicture",(!is_object($this->parent) && !isset($_SESSION['edit']))));
 
     /* Create base acls */
-    @$smarty->assign("bases", $this->allowedBasesToMoveTo());
+    $tmp = @$this->allowedBasesToMoveTo();
+    if($this->multiple_support_active){
+      $tmp['{default}'] = "{"._("default")."}";
+    }
+    $smarty->assign("bases", $tmp);
 
     /* Save government mode attributes */
     if (isset($this->config->current['GOVERNMENTMODE']) &&
@@ -1487,8 +1491,10 @@ class user extends plugin
       unset($ret['cn']);
     }
     $ret['is_modified'] = $this->is_modified;
-    $ret['base']=$this->base;
-   
+    if($this->base != "{default}"){
+      $ret['orig_base']="Changed_by_Multi_Plug";
+      $ret['base']=$this->base;
+    }
     return($ret); 
   }