Added sorting to workstation startup. FAI server/release

[gosa.git] / gosa-plugins / goto / admin / systems / goto / class_workstationService.inc

diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc
index d10108a2ae59c8cf9ed5642d0afe16f42ac7e17d..c7b73b6d07a7963083e5b1e2c349079a414a2eea 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc
@@ -62,8 +62,8 @@ class workservice extends plugin
         "1400x1050" =>  "1400x1050", 
         "1600x1200" =>  "1600x1200");
 
-    if(isset($this->config->data['MAIN']['RESOLUTION_HOOK'])){
-      $file = $this->config->data['MAIN']['RESOLUTION_HOOK'];
+    if(isset($this->config->data['MAIN']['RESOLUTIONS'])){
+      $file = $this->config->data['MAIN']['RESOLUTIONS'];
 
       if(is_readable($file)){
         $str = file_get_contents($file);
@@ -76,7 +76,7 @@ class workservice extends plugin
         }
         //natcasesort($this->gotoXResolutions);
       }else{
-        print_red(sprintf(_("You have specified an external resolution hook which can't be read, please check the permission of the file '%s'."),$file));
+        msg_dialog::display(_("Configuration error"), msgPool::cannotReadFile($file), WARNING_DIALOG);
       }
     }
 
@@ -385,12 +385,12 @@ class workservice extends plugin
 
         if($this->acl_is_writeable("gotoXVsync")){
           if (!preg_match ("/^\d+(\.\d+)?([-]\d+(\.\d+)?)?$/", $val)){
-            $message[]= _("Please specify a valid VSync range.");
+            $message[]= msgPool::invalid(_("VSync"));
           } else{
             list($v1,$v2)= preg_split ("/[-+]/", $val);
             if ($v2 != ""){
               if ($v1 > $v2){
-                $message[]= _("Please specify a valid VSync range.");
+                $message[]= msgPool::invalid(_("VSync"));
               }
             }
           }
@@ -400,12 +400,12 @@ class workservice extends plugin
         $val= preg_replace ("/\s/", "", $this->gotoXHsync);
         if($this->acl_is_writeable("gotoXHsync")){
           if (!preg_match ("/^\d+(\.\d+)?([-]\d+(\.\d+)?)?$/", $val)){
-            $message[]= _("Please specify a valid HSync range.");
+            $message[]= msgPool::invalid(_("HSync"));
           } else{
             list($v1,$v2)= preg_split ("/[-+]/", $val);
             if ($v2 != ""){
               if ($v1 > $v2){
-                $message[]= _("Please specify a valid HSync range.");
+                $message[]= msgPool::invalid(_("HSync"));
               }
             }
           }
@@ -469,7 +469,7 @@ class workservice extends plugin
       }
     } else {
       $drivers = array("ati", "atimisc", "chips", "cirrus", "cyrix", "fbdev", "fglrx",
-          "i128", "i740", "i810", "imstt", "mga", "neomagic", "newport", "nsc",  "nv", "nvidia",
+          "i128", "i740", "i810", "intel", "imstt", "mga", "neomagic", "newport", "nsc",  "nv", "nvidia",
           "r128", "radeon", "rendition", "s3", "s3virge", "savage", "siliconmotion",
           "sis", "tdfx", "tga", "trident", "tseng", "vesa", "vga", "vmware");
     }
@@ -494,8 +494,8 @@ class workservice extends plugin
             "gotoXDriver"           => _("Gfx driver"),
             "gotoXResolution"       => _("Gfx resolution"),
             "gotoXColordepth"       => _("Gfx color depth"),
-            "gotoXHsync"            => _("Hsync"),
-            "gotoXVsync"            => _("Vsync"),
+            "gotoXHsync"            => _("HSync"),
+            "gotoXVsync"            => _("VSync"),
             "AutoSync"              => _("Use DDC"),
             "gotoScannerEnable"     => _("Scanner enabled"),
             "gotoXKbModel"          => _("Keyboard model"),
@@ -506,6 +506,17 @@ class workservice extends plugin
             "goFonHardware"         => _("Telephone hardware")) 
             ));
   }
+
+  function PrepareForCopyPaste($source)
+  {
+    plugin::PrepareForCopyPaste($source);
+
+    if(preg_match("/\+/",$this->gotoXHsync)){
+      $this->AutoSync = true;
+      $this->gotoXHsync = preg_replace("/\+/","-",$this->gotoXHsync);
+      $this->gotoXVsync = preg_replace("/\+/","-",$this->gotoXVsync);
+    }
+  }
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: