Allow "-100324" "12343-" in size field of fai partition table entries.

Added fix from stable revision 5703
Do not allow spaces within class names.
Remember entered class name in "aslclassname" dialog

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

diff --git a/plugins/admin/fai/askClassName.tpl b/plugins/admin/fai/askClassName.tpl
index 526b6a587a2be3b450d087100ef0cd4d92ce3842..f972210a762f2e9827dcb9da15a84544fdc4db34 100644 (file)
--- a/plugins/admin/fai/askClassName.tpl
+++ b/plugins/admin/fai/askClassName.tpl
@@ -29,7 +29,7 @@
    <tr>
      <td>&nbsp;</td>
      <td>
-      {t}Class name{/t}&nbsp;<input type="text"         name="UseTextInputName" value="" style="width:120px;">
+      {t}Class name{/t}&nbsp;<input type="text"         name="UseTextInputName" value="{$ClassName}" style="width:120px;">
      </td>
     </tr>
    </table>

diff --git a/plugins/admin/fai/class_askClassName.inc b/plugins/admin/fai/class_askClassName.inc
index b9f854f75a252d29009b5b85cb4080344621a959..3486cc3c4de40883a99da6dbfc1d718d39810c97 100644 (file)
--- a/plugins/admin/fai/class_askClassName.inc
+++ b/plugins/admin/fai/class_askClassName.inc
@@ -114,6 +114,7 @@ class askClassName extends plugin
       $smarty->assign("grey", "");
     }
     $smarty->assign("ClassNames", $used);
+    $smarty->assign("ClassName",  $this->ClassName);
     $display.= $smarty->fetch(get_template_path('askClassName.tpl', TRUE));
     return($display);
   }
@@ -142,6 +143,10 @@ class askClassName extends plugin
     /* 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.");
     }

diff --git a/plugins/admin/fai/class_faiPackage.inc b/plugins/admin/fai/class_faiPackage.inc
index 51df0c833059591b5a09707b3f16296f4c146749..8b2cc7e833fe3e86a1a798685f9b0000111c84b7 100644 (file)
--- a/plugins/admin/fai/class_faiPackage.inc
+++ b/plugins/admin/fai/class_faiPackage.inc
@@ -409,7 +409,8 @@ class faiPackage extends plugin
         $dsc= "";
         if (preg_match('/^-/', $usedName)){
           $dsc= " - "._("Package marked for removal");
-          $usedName2= preg_replace('/^-/', '! ', $usedName);
+          // Generally a bad idea here, because the toggel triggers on -, not on !
+          //$usedName= preg_replace('/^-/', '! ', $usedName);
         }else{
           $usedName2= $usedName;
         }

diff --git a/plugins/admin/fai/class_faiPartitionTableEntry.inc b/plugins/admin/fai/class_faiPartitionTableEntry.inc
index 57dc434b95679a64eff5249ca8f921e3196d0669..9122d6c3ced763b02d45607435addbdce7b0e17e 100644 (file)
--- a/plugins/admin/fai/class_faiPartitionTableEntry.inc
+++ b/plugins/admin/fai/class_faiPartitionTableEntry.inc
@@ -337,7 +337,6 @@ class faiPartitionTableEntry extends plugin
 
 
     if((isset($_POST['TableEntryFrameSubmitted'])) && ($this->FAIstate != "freeze") ){
-    print_a($_POST);
       plugin::save_object();
 
       foreach($this->partitions as $key => $part){
@@ -417,7 +416,7 @@ class faiPartitionTableEntry extends plugin
                 break;
                 
         case 2:
-                if((!is_id($tmp[0]))||(!is_id($tmp[1]))){
+                if((!is_id($tmp[0]))&&(!is_id($tmp[1]))){
                   $message[]=sprintf(_("Please enter a valid range for partition %s."),($key)); 
                 }elseif($tmp[0]>=$tmp[1]){
                   $message[]=sprintf(_("Please enter a valid range for partition %s."),($key));