faiPackage - repository selection fixed.

this->mirror was used instead of this->FAIdebianMirror

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

diff --git a/plugins/admin/fai/class_faiPackage.inc b/plugins/admin/fai/class_faiPackage.inc
index b346ed4442de2a5b5bfe4d67f81a1a6429b53e43..dd942cf0bc9133b43309e31fcec36822dfcb97ae 100644 (file)
--- a/plugins/admin/fai/class_faiPackage.inc
+++ b/plugins/admin/fai/class_faiPackage.inc
@@ -118,6 +118,7 @@ class faiPackage extends plugin
       }
 
       /* Assign posible changes, for mirror combinations */
+      $this->dialog->save_object();
       $this->dialog->releases = $this->releases;
       $this->dialog->servers  = $this->servers;
       $this->dialog->sections = $this->sections;
@@ -131,7 +132,7 @@ class faiPackage extends plugin
         unset($this->dialog);
         $this->dialog = false;
         $this->is_dialog=false;
-        $this->newDialogShown = true;
+        //  $this->newDialogShown = true;
       }
 
       /* Draw dialog */
@@ -145,12 +146,12 @@ class faiPackage extends plugin
     foreach($this->attributes as $attrs){
       $smarty->assign($attrs,$this->$attrs);
     }
-
+  
     /* Set mirror if changed */
     if((isset($_POST['FAIdebianMirrorS']))&&(!empty($_POST['FAIdebianMirrorS']))){
       $this->FAIdebianMirror = $_POST['FAIdebianMirrorS'];
     }
-
+  
     /* check servers matching release and section settings */
     $availableServer = array();
     foreach($this->mirrors as $mir){
@@ -166,7 +167,7 @@ class faiPackage extends plugin
         }
       }
     }
-    
+ 
     /* Generate package list */
     $this->list=$this->genPkgs();
 
@@ -364,7 +365,7 @@ class faiPackage extends plugin
       $this->buffer=array();
       $a_ret = array();
       foreach($this->FAIdebianSection as $sec){
-        $strID= "/etc/gosa/fai/".$this->mirror."/".$this->FAIdebianRelease."/".$sec;
+        $strID= "/etc/gosa/fai/".$this->FAIdebianMirror."/".$this->FAIdebianRelease."/".$sec;
         
         if(!is_file($strID)){
           print_red(sprintf(_("Package file don't exists '%s'."),$strID));

diff --git a/plugins/admin/fai/class_faiPackageNew.inc b/plugins/admin/fai/class_faiPackageNew.inc
index 3505c39f853e42f11bd6c69b0f197b554e153c3b..350019a5d220c0aad989fc8bd3b8b4b77ebe4c55 100644 (file)
--- a/plugins/admin/fai/class_faiPackageNew.inc
+++ b/plugins/admin/fai/class_faiPackageNew.inc
@@ -51,13 +51,6 @@ class faiPackageNew extends plugin
 
     /* Post handling for Section, Release and Mirror Setup */
     if(isset($_POST['SetRepository'])){
-      if((isset($_POST['FAIdebianReleaseS']))&&(!empty($_POST['FAIdebianReleaseS']))){
-        $this->FAIdebianRelease = $_POST['FAIdebianReleaseS'];
-      }
-      if((isset($_POST['FAIdebianMirrorS']))&&(!empty($_POST['FAIdebianMirrorS']))){
-        $this->FAIdebianMirror = $_POST['FAIdebianMirrorS'];
-      }
-
       foreach($this->sections as $sec => $val){
         if(isset($_POST[$sec])){
           $this->sections[$sec]=true;
@@ -184,6 +177,13 @@ class faiPackageNew extends plugin
   /* Save data to object */
   function save_object()
   {
+    /* Post handling for Section, Release and Mirror Setup */
+    if((isset($_POST['FAIdebianReleaseS']))&&(!empty($_POST['FAIdebianReleaseS']))){
+      $this->FAIdebianRelease = $_POST['FAIdebianReleaseS'];
+    }
+    if((isset($_POST['FAIdebianMirrorS']))&&(!empty($_POST['FAIdebianMirrorS']))){
+      $this->FAIdebianMirror = $_POST['FAIdebianMirrorS'];
+    }
   }
 
   /* Check supplied data */

diff --git a/plugins/admin/fai/class_faiPartitionTable.inc b/plugins/admin/fai/class_faiPartitionTable.inc
index afcc5201b647b0e3716ff16718bbf4008956d076..8d1649e3f7d03f220c56df22c871e578b9d1d172 100644 (file)
--- a/plugins/admin/fai/class_faiPartitionTable.inc
+++ b/plugins/admin/fai/class_faiPartitionTable.inc
@@ -252,11 +252,6 @@ class faiPartitionTable extends plugin
   {
 
     $message= array();
-
-    if((empty($this->cn))||(preg_match("/[^a-z0-9]/i",$this->cn))){
-      $message[]=_("Please enter a valid name.");
-    }
-
     return ($message);
   }