Removed "ja" and "nein" attributes from publicVisible.

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

diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index ec70c7531c9871e9ad7acc4bf7c151bfecb0baa4..32ff64268d9b4dea49e1e046eff84014b8c4f28c 100644 (file)
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -117,6 +117,12 @@ class user extends plugin
           $this->$val= $this->attrs["$val"][0];
         }
       }
+
+      /* Fix public visible attribute if unset */
+      if (!isset($this->attrs['publicVisible'])){
+        $this->publicVisible == "nein";
+      }
+
     }
 
     /* Create me for new accounts */
@@ -435,7 +441,7 @@ class user extends plugin
         preg_match('/true/i', $this->config->current['GOVERNMENTMODE'])){
       $smarty->assign("governmentmode", "true");
       $ivbbmodes= array("nein", "ivbv", "testa", "ivbv,testa", "internet",
-          "internet,ivbv", "internet,testa", "internet,ivbv,testa", "ja");
+          "internet,ivbv", "internet,testa", "internet,ivbv,testa");
       $smarty->assign("ivbbmodes", $ivbbmodes);
       foreach ($this->govattrs as $val){
         $smarty->assign("$val", $this->$val);
@@ -601,6 +607,11 @@ class user extends plugin
         }
       }
 
+      /* Remove attribute if set to "nein" */
+      if ($this->publicVisible == "nein"){
+        $this->attrs['publicVisible']= array();
+      }
+
     }
 
     /* Special handling for attribute userCertificate needed */