Applied patches from lhm commits

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

diff --git a/gosa-plugins/goto/admin/ogroups/goto/class_termgroup.inc b/gosa-plugins/goto/admin/ogroups/goto/class_termgroup.inc
index b37bef3dfa21b4474b2164e3dd54e25cf56601e2..fe2496c6b05ae12c93eb565a5ef44dca8672782e 100644 (file)
--- a/gosa-plugins/goto/admin/ogroups/goto/class_termgroup.inc
+++ b/gosa-plugins/goto/admin/ogroups/goto/class_termgroup.inc
@@ -61,7 +61,7 @@ class termgroup extends plugin
         if(isset($this->attrs['member'])){
             for ($i= 0; $i<$this->attrs['member']['count']; $i++){
                 $member= $this->attrs['member'][$i];
-                array_push($this->member_dn, $member);
+                array_push($this->member_dn, @LDAP::convert($member)); 
                 $ldap->cat($member, array('objectClass', 'macAddress', 'cn'));
                 if ($ldap->success()){
                     $attrs = $ldap->fetch();

diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
index abc84928ff5be3eacb293c4e2304aa2403245230..8fa9eddc727ef19ff860c7fb648c55e2a68d9031 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
@@ -81,6 +81,19 @@ class workstartup extends plugin
                 $attrs = $ldap->fetch();
                 $this->o_group_dn = $attrs['dn'];
             }
+
+            if ($ldap->count() > 1) { 
+                $ogroups = array(); 
+                array_push($ogroups, $attrs['dn']); 
+                while ($attrs = $ldap->fetch()) { 
+                    array_push($ogroups, $attrs['dn']); 
+                } 
+                $str = ""; 
+                foreach($ogroups as $dn) { 
+                    $str .= "<li>".$dn."</li>"; 
+                } 
+                msg_dialog::display(_("Warning"), sprintf(_("This system is member of more than one object group, object group inheritence will not work!")."<br><ul>%s</ul>", $str), WARNING_DIALOG); 
+            } 
         }
 
         /* Creating a list of valid Mirrors