Updated divlists.

[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..3486cc3c4de40883a99da6dbfc1d718d39810c97 100644 (file)
--- a/plugins/admin/fai/class_askClassName.inc
+++ b/plugins/admin/fai/class_askClassName.inc
@@ -22,10 +22,16 @@ class askClassName extends plugin
     $this->ui = $ui;
     $this->objectClass = $objectClass;
     plugin::plugin ($config, $dn);
+    if(!isset($_SESSION['CurrentMainBase'])){
+      $_SESSION['CurrentMainBase'] = $this->config->current['BASE'];
+    }
   }
 
   function execute()
   {
+    /* Call parent execute */
+    plugin::execute();
+
     /* Fill templating stuff */
     $smarty = get_smarty();
     $display= "";
@@ -38,29 +44,40 @@ 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'];
+
+    $base = "ou=fai,ou=configs,ou=systems,".$_SESSION['CurrentMainBase'];
+    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();
+    
+    $res= get_list("(&(objectClass=organizationalUnit)(!(objectClass=FAIbranch)))", "fai", $base,
+                   array("cn","description","objectClass"), GL_SIZELIMIT );
 
     $delete = array();
+    $used   = array();
     foreach($res as $objecttypes){
-      $res2 = get_list2($this->ui->subtreeACL, "(objectClass=*)",
-          FALSE, $objecttypes['dn'], array("cn","description","objectClass","FAIclass"),TRUE);
-
+      $res2= get_list("(objectClass=*)", "fai", $objecttypes['dn'],
+                      array("cn","description","objectClass","FAIclass","FAIstate"), GL_SIZELIMIT | GL_CONVERT );
       foreach($res2 as $object){
+
         /* skip class names with this name */ 
         if(in_array($this->objectClass,$object['objectClass'])){
+          if(isset($object['FAIstate'][0]) && preg_match("/removed$/",$object['FAIstate'][0])){
+            continue;
+          }
           $delete[] = $object['cn'][0];
         }
     
         /* 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];
+          }
         }
       }
     }
-    
+
     /* Create headline
      * Depending on the object type we want to create, a different headline will be shown
      */ 
@@ -91,11 +108,13 @@ 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);
+    $smarty->assign("ClassName",  $this->ClassName);
     $display.= $smarty->fetch(get_template_path('askClassName.tpl', TRUE));
     return($display);
   }
@@ -121,7 +140,13 @@ class askClassName extends plugin
    */
   function check()
   {
-    $message= array();
+    /* Call common method to give check the hook */
+    $message= plugin::check();
+  
+    if($this->ClassName != preg_replace("/ /","",trim($this->ClassName))){
+      $message[] = _("Spaces are not allowed within class names.");
+    }
+
     if(empty($this->ClassName)){
       $message[]=_("The given class name is empty.");
     }
@@ -130,10 +155,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);
   }