Code

Fixed missing images problem in group headpage
[gosa.git] / plugins / admin / fai / class_faiPackage.inc
index dd942cf0bc9133b43309e31fcec36822dfcb97ae..f58acfd12264cbfdf21dfea1378b8087e8f09aee 100644 (file)
@@ -70,6 +70,7 @@ class faiPackage extends plugin
       foreach($this->attrs['FAIpackage'] as $pkg){
         $this->usedPackages[$pkg] = $pkg;
       }
+      ksort($this->usedPackages);
     }else{
       $this->usedPackages = array();
     }  
@@ -132,7 +133,7 @@ class faiPackage extends plugin
         unset($this->dialog);
         $this->dialog = false;
         $this->is_dialog=false;
-        //  $this->newDialogShown = true;
+        $this->newDialogShown = true;
       }
 
       /* Draw dialog */
@@ -200,6 +201,7 @@ class faiPackage extends plugin
         $this->usedPackages = $use;
         $this->dialog = false;
         $this->is_dialog=false;
+        ksort($this->usedPackages);
       }
     }
 
@@ -365,10 +367,10 @@ class faiPackage extends plugin
       $this->buffer=array();
       $a_ret = array();
       foreach($this->FAIdebianSection as $sec){
-        $strID= "/etc/gosa/fai/".$this->FAIdebianMirror."/".$this->FAIdebianRelease."/".$sec;
+        $strID= "/etc/gosa/fai/".preg_replace("#^[^/]+//([^/]+).*$#","\\1",$this->FAIdebianMirror)."/".$this->FAIdebianRelease."/".$sec;
         
         if(!is_file($strID)){
-          print_red(sprintf(_("Package file don't exists '%s'."),$strID));
+          print_red(sprintf(_("Package file '%s' does not exist."),$strID));
           $this->FAIdebianMirror="";
           unset($this->buffer);
           return(array());