Updated locales, removed additional filter session stuff

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

diff --git a/gosa-core/locale/core/de/LC_MESSAGES/messages.po b/gosa-core/locale/core/de/LC_MESSAGES/messages.po
index f9b1f7b86a8708c6f894a523ac6da378459351f7..9e243d8bac650d483e71b3ff65c0235f9d577bfd 100644 (file)
--- a/gosa-core/locale/core/de/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/de/LC_MESSAGES/messages.po
@@ -3063,7 +3063,7 @@ msgid ""
 "added:"
 msgstr ""
 "Die folgenden Systeme sind bereits für die Konfiguration über eine "
-"Objektgruppe vorgeseheb und können nicht hinzugefügt werden:"
+"Objektgruppe vorgesehen und können nicht hinzugefügt werden:"
 
 #: plugins/admin/ogroups/class_ogroup.inc:819
 msgid "You can combine two different object types at maximum, only!"

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index 811096435d808a421d685db562aa8ce925c9376d..4ea48489de4ad316ec40a72031ccbd8228cebcfc 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -85,37 +85,6 @@ class ogroup extends plugin
     }
     $this->is_account= TRUE;
 
-    /* Get global filter config */
-    if (!session::is_set("ogfilter")){
-      $ui= get_userinfo();
-      $base= get_base_from_people($ui->dn);
-      $ogfilter= array( "dselect"       => $base,
-          "regex"           => "*");
-      session::set("ogfilter", $ogfilter);
-    }
-    $ogfilter= session::get('ogfilter');
-
-    /* Adjust flags */
-    foreach( array(   "U" => "accounts",
-          "G" => "groups",
-          "A" => "applications",
-          "D" => "departments",
-          "S" => "servers",
-          "W" => "workstations",
-          "O" => "winstations",
-          "T" => "terminals",
-          "F" => "phones",
-          "_" => "subtrees",
-          "P" => "printers") as $key => $val){
-
-      if (preg_match("/$key/", $this->gosaGroupObjects)){
-        $ogfilter[$val]= "checked";
-      } else {
-        $ogfilter[$val]= "";
-      }
-    }
-    session::set("ogfilter", $ogfilter);
-  
     /* Set base */
     if ($this->dn == "new"){
       $ui = get_userinfo();