Added check to avoid multiple uploads of the same file

[gosa.git] / plugins / admin / systems / class_workstationStartup.inc

diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index 8fb322f81769586f803b2f62566bb5f7cb1f1b2a..07a925b61fed2d0d44e97c36b1ccb5ff5f66c9ac 100644 (file)
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -20,7 +20,7 @@ class workstartup extends plugin
   var $FAIclass             = array();
   var $FAIclasses           = array();
   var $FAIclassInfo         = array();
-  var $FAIdebianMirror      = array();
+  var $FAIdebianMirror      = "auto";
 
 
   /* attribute list for save action */
@@ -68,9 +68,10 @@ class workstartup extends plugin
           }
         }
       }
-    } 
+    }
+    ksort($ret);
     $this->FAIdebianMirrors = $ret;
- 
+
     /* Get arrays */
     foreach (array("gotoModules", "gotoAutoFs", "gotoFilesystem") as $val){
       if (isset($this->attrs["$val"]["count"])){
@@ -404,9 +405,6 @@ class workstartup extends plugin
     $str_empty  = " &nbsp;<img src='images/empty.png' alt=\"\" width='7'>"; 
 
     $i = 1;
-    if(is_array($this->FAIclass)){
-      natcasesort($this->FAIclass);
-    }
 
     foreach($this->FAIclass as $class){
       if($i==1){
@@ -465,30 +463,35 @@ class workstartup extends plugin
   function getFAIdebianMirrors()
   {
     $ret = array();
-
-    foreach($this->FAIclass as $classes){
-      if(isset($this->FAIclassInfo[ $classes]['FAIpackageList']['sec'])){
-        if(isset($this->FAIclassInfo[ $classes]['FAIpackageList']['sec']['count'])){
-          unset($this->FAIclassInfo[ $classes]['FAIpackageList']['sec']['count']);
-        }
-    
-        foreach($this->FAIclassInfo[ $classes]['FAIpackageList']['sec'] as $sec => $value){
-          $secs[$value]= $value;
+    $ret['auto']=_("automatic");
+    $secs  = array();
+    if(is_array($this->FAIclass)){
+      foreach($this->FAIclass as $classes){
+        if(isset($this->FAIclassInfo[ $classes]['FAIpackageList']['sec'])){
+          if(isset($this->FAIclassInfo[ $classes]['FAIpackageList']['sec']['count'])){
+            unset($this->FAIclassInfo[ $classes]['FAIpackageList']['sec']['count']);
+          }
+          if(is_array($this->FAIclassInfo[ $classes]['FAIpackageList']['sec'])){
+            foreach($this->FAIclassInfo[ $classes]['FAIpackageList']['sec'] as $sec => $value){
+              $secs[$value]= $value;
+            }
+          }
         }
       }
     }
-    foreach($this->FAIdebianMirrors as $mirr=>$sections){
-      $allok = true;
-      foreach($secs as $sec){
-        if(!in_array($sec,$sections)){
-          $allok = false;
+    if(is_array($this->FAIdebianMirrors)){
+      foreach($this->FAIdebianMirrors as $mirr=>$sections){
+        $allok = true;
+        foreach($secs as $sec){
+          if(!in_array($sec,$sections)){
+            $allok = false;
+          }
+        }
+        if($allok){
+          $ret[$mirr]=$mirr;
         }
-      }
-      if($allok){
-        $ret[$mirr]=$mirr;
       }
     }
-    $ret['auto']=_("automatic");
     return($ret);
   }