Merge branch '5135-filter-enhancement-and-management-refactor' into '1.4-dev'

Resolve "filter enhancement and management refactor"

See merge request fusiondirectory/fd!370

plugins/admin/groups/class_GroupContentColumn.inc

@@ -38,10 +38,14 @@ class GroupContentColumn extends Column
       if ($types[$i] == 'I') {
         continue;
       }
-      $infos  = objects::infos(ogroup::$objectTypes[$types[$i]]);
-      $result .= '<img src="'.htmlentities($infos['icon'], ENT_COMPAT, 'UTF-8').'"'.
-                  ' alt="'.htmlentities($infos['name'], ENT_COMPAT, 'UTF-8').'"'.
-                  ' title="'.htmlentities($infos['name'], ENT_COMPAT, 'UTF-8').'"/>';
+      try {
+        $infos  = objects::infos(ogroup::$objectTypes[$types[$i]]);
+        $result .= '<img src="'.htmlentities($infos['icon'], ENT_COMPAT, 'UTF-8').'"'.
+                    ' alt="'.htmlentities($infos['name'], ENT_COMPAT, 'UTF-8').'"'.
+                    ' title="'.htmlentities($infos['name'], ENT_COMPAT, 'UTF-8').'"/>';
+      } catch (NonExistingObjectTypeException $e) {
+        continue;
+      }
     }
     if ($result == '') {
       return '&nbsp;';

plugins/admin/groups/class_GroupContentFilterElement.inc

@@ -33,12 +33,16 @@ class GroupContentFilterElement extends FilterElement
 
     $this->types = array();
     foreach (ogroup::$objectTypes as $key => $type) {
-      $infos = objects::infos($type);
-      $this->types[$type] = array(
-        'filter'  => '(gosaGroupObjects=*'.$key.'*)',
-        'infos'   => $infos,
-        'checked' => FALSE,
-      );
+      try {
+        $infos = objects::infos($type);
+        $this->types[$type] = array(
+          'filter'  => '(gosaGroupObjects=*'.$key.'*)',
+          'infos'   => $infos,
+          'checked' => FALSE,
+        );
+      } catch (NonExistingObjectTypeException $e) {
+        continue;
+      }
     }
   }
 

plugins/admin/groups/class_ogroup.inc

@@ -52,8 +52,7 @@ class ObjectsAttribute extends GenericDialogAttribute
             break;
           }
         } catch (NonExistingObjectTypeException $e) {
-          @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $e->getMessage(), "Objecttype");
-          unset(ogroup::$objectTypes[$code]);
+          continue;
         }
       }
       if (!isset($this->displays[$i])) {
@@ -82,13 +81,12 @@ class ObjectsAttribute extends GenericDialogAttribute
                 ($this->disabled ? ' disabled="disabled"' : '').
                 ' >'."\n";
     foreach ($this->getDisplayValues() as $key => $value) {
+      $infos = array();
       try {
-        $infos = array();
         if ($this->types[$key] !== 'I') {
           $infos = objects::infos(ogroup::$objectTypes[$this->types[$key]]);
         }
       } catch (NonExistingObjectTypeException $e) {
-        die('No type for '.$key.' '.$value);
       }
       if (isset($infos['icon'])) {
         $img = $infos['icon'];