X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Ffai%2Fadmin%2Ffai%2Fclass_askClassName.inc;h=945c0d54f4a3dd7c23e43592494a3c756580b7c3;hb=fd75cee204401a00a137e1c795d5a7d887ab2903;hp=cde5eb96604a8d5a009b8b7ce150d78d8e171414;hpb=01e906423fba15a84da31e1c64e6b233a799ff3f;p=gosa.git

diff --git a/gosa-plugins/fai/admin/fai/class_askClassName.inc b/gosa-plugins/fai/admin/fai/class_askClassName.inc
index cde5eb966..945c0d54f 100644
--- a/gosa-plugins/fai/admin/fai/class_askClassName.inc
+++ b/gosa-plugins/fai/admin/fai/class_askClassName.inc
@@ -11,15 +11,13 @@ class askClassName extends plugin
   var $forbidden          = array();
   var $ClassName          = "";  
   var $ClassAlreadyExists = false;
+  var $parent;
 
   function askClassName (&$config,$dn,$ui,$objectClass)
   {
     $this->ui = $ui;
     $this->objectClass = $objectClass;
     plugin::plugin ($config, $dn);
-    if(!session::is_set('CurrentMainBase')){
-      session::set('CurrentMainBase',$this->config->current['BASE']);
-    }
   }
 
   function execute()
@@ -31,22 +29,13 @@ class askClassName extends plugin
     $smarty = get_smarty();
     $display= "";
 
-    /* The faifilter contais 
-     * The base for all fai objects 
-     */
-    $faifilter  = session::get('faifilter');
-
     /* First search for every ou, in given fai base
      * With a second search detect all object that belong to the different ous. 
      */
 
-    $base = get_ou('faiou').session::get('CurrentMainBase');
-    if($faifilter['branch'] != "main"){
-      $base = $faifilter['branch'];
-    }
+    $base = $this->parent->fai_release;
     $ldap = $this->config->get_ldap_link();
 
-
     $type_acl_mapping = array(
         "FAIpartitionTable"  => "faiPartitionTable",
         "FAIpackageList"     => "faiPackage",
@@ -148,12 +137,16 @@ class askClassName extends plugin
   {
     /* Call common method to give check the hook */
     $message= plugin::check();
-  
+
+    if($this->objectClass == "FAIscript" && preg_match("/^-/", $this->ClassName)) { 
+      $message[] = msgPool::invalid(_("Name"),preg_replace("/ /","_",$this->ClassName),"/[^_]/");
+    }   
+
     if($this->ClassName != preg_replace("/ /","",trim($this->ClassName))){
       $message[] = msgPool::invalid(_("Name"),preg_replace("/ /","_",$this->ClassName),"/[^_]/");
     }
 
-    if(empty($this->ClassName)){
+    if($this->ClassName == ""){
       $message[]= msgPool::required(_("Name"));
     }