Updated

[gosa.git] / plugins / admin / fai / class_askClassName.inc

diff --git a/plugins/admin/fai/class_askClassName.inc b/plugins/admin/fai/class_askClassName.inc
index d7cb25485939e9b482f07448de472381a646e358..13b923a8b0cbd45c1014b117e408b4058d9de4a3 100644 (file)
--- a/plugins/admin/fai/class_askClassName.inc
+++ b/plugins/admin/fai/class_askClassName.inc
@@ -26,6 +26,9 @@ class askClassName extends plugin
 
   function execute()
   {
+       /* Call parent execute */
+       plugin::execute();
+
     /* Fill templating stuff */
     $smarty = get_smarty();
     $display= "";
@@ -38,7 +41,11 @@ class askClassName extends plugin
     /* First search for every ou, in given fai base
      * With a second search detect all object that belong to the different ous. 
      */
+
     $base = "ou=fai,ou=configs,ou=systems,".$faifilter['base'];
+    if($faifilter['branch'] != "main"){
+      $base = $faifilter['branch'];
+    }
     $ldap = $this->config->get_ldap_link();
     $res  = get_list($this->ui->subtreeACL, "(objectClass=organizationalUnit)",FALSE, $base, array("cn","description","objectClass"),TRUE);
     $used = array();
@@ -56,7 +63,9 @@ class askClassName extends plugin
     
         /* Skip profiles */
         if(!in_array("FAIprofile",$object['objectClass'])){
-          $used[$object['cn'][0]]= $object['cn'][0];
+          if(isset($object['cn'])){
+            $used[$object['cn'][0]]= $object['cn'][0];
+          }
         }
       }
     }
@@ -91,8 +100,10 @@ class askClassName extends plugin
      */
     if(count ($used)==0){
       $smarty->assign("ClassNamesAvailable", " disabled ");
+      $smarty->assign("grey", 'style="color:#C0C0C0"');
     }else{
       $smarty->assign("ClassNamesAvailable", "");
+      $smarty->assign("grey", "");
     }
     $smarty->assign("ClassNames", $used);
     $smarty->assign("ClassNameKeys", $used);
@@ -130,10 +141,6 @@ class askClassName extends plugin
       $message[]=_("The specified class name is already in use for this object type.");
     }
 
-    if(preg_match("/[^a-z0-9]/i",$this->ClassName)){
-      $message[]=_("Please enter a valid class name. Only 0-9 a-z is allowed here.");
-    }
- 
     return ($message);
   }