From e3efadbb92dad8f63363699e83e5e2babaa8bdf9 Mon Sep 17 00:00:00 2001 From: cajus Date: Thu, 24 Jan 2008 15:49:04 +0000 Subject: [PATCH] Moved things - again git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8594 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../systems/goto/class_terminalService.inc | 30 +- .../goto/admin/systems/goto/scanner-list | 533 ------------------ .../admin/systems/goto/terminalService.tpl | 41 -- 3 files changed, 7 insertions(+), 597 deletions(-) delete mode 100644 gosa-plugins/goto/admin/systems/goto/scanner-list diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc index b8c3005e8..c81c2571a 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc @@ -47,7 +47,6 @@ class termservice extends plugin var $XKbVariants= array (); var $MouseTypes= array(); var $MousePorts= array(); - var $gotoScannerModels= array(); var $hardware_list= array(); var $used_hardware= array(); @@ -145,23 +144,10 @@ class termservice extends plugin } } - /* Load scanner models */ - $fcontents = file (CONFIG_DIR."/scanner-list"); - while (list ($line_num, $line) = each ($fcontents)) { - preg_match('/^(\w+) "([^"]+)" "([^"]+)" "([^"]+)"/', "$line", $matches); - $this->gotoScannerModels[$matches[2]." - ".$matches[3]]= $matches[1]."|".$matches[4]; - } - ksort ($this->gotoScannerModels); - /* Initialize methods */ $this->XMethods["default"]= _("default"); - $this->XMethods["indirect"]= _("show chooser"); - $this->XMethods["query"]= _("direct"); -#$this->XMethods["squery"]= _("direct via ssh"); -#$this->XMethods["nquery"]= _("direct via nx"); - $this->XMethods["load"]= _("load balanced"); -#$this->XMethods["sload"]= _("load balanced via ssh"); -#$this->XMethods["nload"]= _("load balanced via nx"); + $this->XMethods["xdmcp"]= _("XDMCP"); + $this->XMethods["ldm"]= _("LDM"); $this->XMethods["rdp"]= _("Windows RDP"); $this->XMethods["citrix"]= _("ICA client"); @@ -277,7 +263,7 @@ class termservice extends plugin /* Arrays */ foreach(array("XMethods", "XDrivers", "XResolutions", "XColordepths", - "gotoScannerModels", "XKbModels","XKbVariants", + "XKbModels","XKbVariants", "MouseTypes", "MousePorts") as $val){ $smarty->assign("$val", $this->$val); } @@ -290,9 +276,9 @@ class termservice extends plugin $smarty->assign("nfsservers", $this->config->data['SERVERS']['NFS']); /* Variables - select */ - foreach(array("gotoXMethod", "gotoXdmcpServer", "gotoFontPath", + foreach(array("gotoXMethod", "gotoXdmcpServer", "gotoXDriver", "gotoXResolution", "gotoXColordepth", - "gotoLpdServer", "gotoScannerModel", "gotoXKbModel", "gotoXKbLayout", + "gotoLpdServer", "gotoXKbModel", "gotoXKbLayout", "gotoXKbVariant", "gotoXMouseType", "gotoXMouseport") as $val){ $smarty->assign($val."_select", $this->$val); @@ -437,9 +423,9 @@ class termservice extends plugin plugin::save(); /* Strip out 'default' values */ - foreach(array("gotoXMethod", "gotoXdmcpServer", "gotoFontPath", + foreach(array("gotoXMethod", "gotoXdmcpServer", "gotoXDriver", "gotoXResolution", "gotoXColordepth", - "gotoLpdServer", "gotoScannerModel", "gotoXKbModel", "gotoXKbLayout", + "gotoLpdServer", "gotoXKbModel", "gotoXKbLayout", "gotoXKbVariant", "gotoXMouseType", "gotoXMouseport") as $val){ if ($this->attrs[$val] == "default"){ @@ -502,7 +488,6 @@ class termservice extends plugin "gotoXMonitor" => _("Monitor"), "gotoXMethod" => _("Method"), "gotoXdmcpServer" => _("Remote desktop"), - "gotoFontPath" => _("Font path"), "gotoXDriver" => _("Gfx driver"), "gotoXResolution" => _("Gfx resolution"), "gotoXColordepth" => _("Gfx color depth"), @@ -512,7 +497,6 @@ class termservice extends plugin "gotoLpdEnable" => _("Printer service enabled"), "gotoLpdServer" => _("Spool server"), "gotoScannerEnable" => _("Scanner enabled"), - "gotoScannerModel" => _("Scanner model"), "gotoXKbModel" => _("Keyboard model"), "gotoXKbLayout" => _("Keyboard layout"), "gotoXKbVariant" => _("Keyboard variant"), diff --git a/gosa-plugins/goto/admin/systems/goto/scanner-list b/gosa-plugins/goto/admin/systems/goto/scanner-list deleted file mode 100644 index 3ebf2a102..000000000 --- a/gosa-plugins/goto/admin/systems/goto/scanner-list +++ /dev/null @@ -1,533 +0,0 @@ -abaton "Abaton" "Scan 300/GS" "SCSI" -abaton "Abaton" "Scan 300/S" "SCSI" -agfafocus "AGFA" "Focus GS Scanner" "SCSI" -agfafocus "AGFA" "Focus Lineart Scanner" "SCSI" -agfafocus "AGFA" "Focus II" "SCSI" -agfafocus "AGFA" "Focus Color" "SCSI" -agfafocus "AGFA" "Focus Color Plus" "SCSI" -agfafocus "Siemens" "S9036" "SCSI" -apple "Apple" "Apple Scanner" "SCSI" -apple "Apple" "OneScanner" "SCSI" -apple "Apple" "ColorOneScanner" "SCSI" -artec "Artec/Ultima" "AT3" "SCSI" -artec "Artec/Ultima" "A6000C" "SCSI" -artec "Artec/Ultima" "A6000C PLUS" "SCSI" -artec "Artec/Ultima" "AT6" "SCSI" -artec "Artec/Ultima" "AT12" "SCSI" -artec "Artec/Ultima" "AM12S" "SCSI" -artec "BlackWidow" "BW4800SP" "SCSI" -artec "Plustek" "OpticPro 19200S" "SCSI" -artec_eplus48u "Artec" "E+ 48U" "USB" -artec_eplus48u "Tevion" "MD9693" "USB" -artec_eplus48u "Medion" "MD9693" "USB" -artec_eplus48u "Medion" "MD9705" "USB" -artec_eplus48u "Medion" "MD4394" "USB" -artec_eplus48u "Trust" "Easy Webscan 19200" "USB" -artec_eplus48u "Memorex" "Mem 48 u" "USB" -as6e "Artec/Ultima" "AS6E" "Parport" -avision "Avision" "AV100CS" "SCSI" -avision "Avision" "AV100IIICS" "SCSI" -avision "Avision" "AV100S" "SCSI" -avision "Avision" "AV240SC" "SCSI" -avision "Avision" "AV260CS" "SCSI" -avision "Avision" "AV360CS" "SCSI" -avision "Avision" "AV363CS" "SCSI" -avision "Avision" "AV420CS" "SCSI" -avision "Avision" "AV6120" "SCSI" -avision "Avision" "AV620CS" "SCSI" -avision "Avision" "AV620CS Plus" "SCSI" -avision "Avision" "AV630CS" "SCSI" -avision "Avision" "AV630CSL" "SCSI" -avision "Avision" "AV6240" "SCSI" -avision "Avision" "AV600U" "USB" -avision "Avision" "AV660S" "USB" -avision "Avision" "AV680S" "USB" -avision "Avision" "AV690U" "USB" -avision "Avision" "AV800S" "SCSI" -avision "Avision" "AV810C" "SCSI" -avision "Avision" "AV820" "SCSI" -avision "Avision" "AV820C" "SCSI" -avision "Avision" "AV820C Plus" "SCSI" -avision "Avision" "AV830C" "SCSI" -avision "Avision" "AV830C Plus" "SCSI" -avision "Avision" "AV880" "SCSI" -avision "Avision" "AV880C" "SCSI" -avision "Avision" "AV8000S" "SCSI" -avision "Avision" "AVA3" "SCSI" -avision "Hewlett-Packard" "ScanJet 5300C" "USB" -avision "Hewlett-Packard" "ScanJet 5370C" "USB" -avision "Hewlett-Packard" "ScanJet 7400c" "USB" -avision "Minolta" "FS-V1" "USB" -avision "Mitsubishi" "MCA-ADFC" "SCSI" -avision "Mitsubishi" "S1200C" "SCSI" -avision "Mitsubishi" "S600C" "SCSI" -avision "Mitsubishi" "SS600" "SCSI" -avision "Fujitsu" "ScanPartner" "SCSI" -avision "Fujitsu" "ScanPartner 10" "SCSI" -avision "Fujitsu" "ScanPartner 10C" "SCSI" -avision "Fujitsu" "ScanPartner 15C" "SCSI" -avision "Fujitsu" "ScanPartner 300C" "SCSI" -avision "Fujitsu" "ScanPartner 600C" "SCSI" -avision "Fujitsu" "ScanPartner Jr" "SCSI" -bh "Bell and Howell" "COPISCAN II 6338" "SCSI" -bh "Bell and Howell" "COPISCAN II 2135" "SCSI" -bh "Bell and Howell" "COPISCAN II 2137(A)" "SCSI" -bh "Bell and Howell" "COPISCAN II 2138A" "SCSI" -bh "Bell and Howell" "COPISCAN II 3238" "SCSI" -bh "Bell and Howell" "COPISCAN II 3338(A)" "SCSI" -canon "Canon" "CanoScan 300" "SCSI" -canon "Canon" "CanoScan 600" "SCSI" -canon "Canon" "CanoScan 620S" "SCSI" -canon "Canon" "CanoScan 2700F" "SCSI" -canon "Canon" "CanoScan 2710" "SCSI" -canon630u "Canon" "CanoScan fb630u" "USB" -canon630u "Canon" "CanoScan fb636u" "USB" -canon_pp "Canon" "CanoScan FB310P" "Parport (ECP)" -canon_pp "Canon" "CanoScan FB610P" "Parport (ECP)" -canon_pp "Canon" "CanoScan FB320P" "Parport (ECP)" -canon_pp "Canon" "CanoScan FB620P" "Parport (ECP)" -canon_pp "Canon" "CanoScan FB330P" "Parport (ECP)" -canon_pp "Canon" "CanoScan FB630P" "Parport (ECP)" -canon_pp "Canon" "CanoScan N340P" "Parport (ECP)" -canon_pp "Canon" "CanoScan N640P" "Parport (ECP)" -canon_pp "Canon" "CanoScan N640P ex" "Parport (ECP)" -coolscan "Nikon" "LS-20" "SCSI" -coolscan "Nikon" "LS-30" "SCSI" -coolscan "Nikon" "LS-2000" "SCSI" -coolscan "Nikon" "LS-1000" "SCSI" -coolscan2 "Nikon" "LS 30" "SCSI" -coolscan2 "Nikon" "LS 2000" "SCSI" -coolscan2 "Nikon" "LS 40 ED" "USB" -coolscan2 "Nikon" "LS 4000 ED" "IEEE1394" -coolscan2 "Nikon" "LS 8000 ED" "IEEE1394" -dc210 "Kodak" "DC210" "Serial port" -dc240 "Kodak" "DC240" "Serial port" -dc25 "Kodak" "DC25" "Serial port" -dc25 "Kodak" "DC20" "Serial port" -dmc "Polaroid" "DMC" "SCSI" -epson "Epson" "GT-5000" "Parport" -epson "Epson" "Actionscanner II" "Parport" -epson "Epson" "GT-6000" "SCSI Parport" -epson "Epson" "ES-300C" "SCSI Parport" -epson "Epson" "GT-5500" "SCSI" -epson "Epson" "GT-6500" "Parport" -epson "Epson" "ES-600C" "Parport" -epson "Epson" "ES-1200C" "Parport" -epson "Epson" "GT-7000" "SCSI" -epson "Epson" "GT-8000" "SCSI" -epson "Epson" "ES-8500" "SCSI" -epson "Epson" "Perfection 636S" "SCSI" -epson "Epson" "Perfection 636U" "USB" -epson "Epson" "Perfection 610" "USB" -epson "Epson" "Perfection 640" "USB" -epson "Epson" "Perfection 1200S" "SCSI" -epson "Epson" "Perfection 1200U" "USB" -epson "Epson" "Perfection 1200Photo" "USB" -epson "Epson" "Perfection 1240" "SCSI USB" -epson "Epson" "Perfection 1640" "SCSI USB" -epson "Epson" "Perfection 1650" "USB" -epson "Epson" "Perfection 1660" "USB" -epson "Epson" "Perfection 2400" "USB" -epson "Epson" "Perfection 2450" "USB IEEE-1394" -epson "Epson" "Perfection 3200" "USB" -epson "Epson" "Expression 636" "SCSI" -epson "Epson" "Expression 800" "SCSI" -epson "Epson" "Expression 1600" "SCSI USB IEEE-1394" -epson "Epson" "Expression 1680" "SCSI USB IEEE-1394" -epson "Epson" "FilmScan 200" "SCSI" -epson "Epson" "CX-3200" "USB" -epson "Epson" "CX-5200" "USB" -fujitsu "Fujitsu" "M3096G" "SCSI" -fujitsu "Fujitsu" "M3091DCd" "SCSI" -fujitsu "Fujitsu" "M3092DCd" "SCSI" -fujitsu "Fujitsu" "M3093GXim" "SCSI" -fujitsu "Fujitsu" "M3093GDim" "SCSI" -fujitsu "Fujitsu" "M4097" "SCSI" -fujitsu "Fujitsu" "fi-4340C" "SCSI" -gt68xx "Mustek" "BearPaw 1200 CS" "USB" -gt68xx "Mustek" "BearPaw 1200 CU" "USB" -gt68xx "Mustek" "BearPaw 1200 CU Plus" "USB" -gt68xx "Mustek" "BearPaw 1200 TA" "USB" -gt68xx "Mustek" "BearPaw 2400 CS" "USB" -gt68xx "Mustek" "BearPaw 2400 CS Plus" "USB" -gt68xx "Mustek" "BearPaw 2400 CU" "USB" -gt68xx "Mustek" "BearPaw 2400 CU Plus" "USB" -gt68xx "Mustek" "BearPaw 2400 TA" "USB" -gt68xx "Mustek" "BearPaw 2400 TA Plus" "USB" -gt68xx "Mustek" "ScanExpress 1200 UB Plus" "USB" -gt68xx "Mustek" "ScanExpress A3 USB" "USB" -gt68xx "Mustek" "ScanExpress 2400 USB" "USB" -gt68xx "Plustek" "OpticPro 1248U" "USB" -gt68xx "Plustek" "OpticPro UT16B" "USB" -gt68xx "Artec" "Ultima 2000" "USB" -gt68xx "Artec" "Ultima 2000 e+" "USB" -gt68xx "Boeder" "Sm@rtScan Slim Edition" "USB" -gt68xx "Packard Bell" "Diamond 1200" "USB" -gt68xx "Medion/Lifetec/Tevion/Cytron" "LT 9452" "USB" -gt68xx "Medion/Lifetec/Tevion/Cytron" "MD/LT 9375" "USB" -gt68xx "Medion/Lifetec/Tevion/Cytron" "MD/LT 9385" "USB" -gt68xx "Medion/Lifetec/Tevion/Cytron" "MD 9458" "USB" -gt68xx "Trust" "Flat Scan USB 19200" "USB" -gt68xx "Trust" "Compact Scan USB 19200" "USB" -gt68xx "Lexmark" "X70" "USB" -gt68xx "Lexmark" "X73" "USB" -gt68xx "Genius" "Colorpage Vivid3x" "USB" -hp "Hewlett-Packard" "ScanJet Plus" "Propietary" -hp "Hewlett-Packard" "ScanJet IIc" "SCSI" -hp "Hewlett-Packard" "ScanJet IIp" "SCSI" -hp "Hewlett-Packard" "ScanJet IIcx" "SCSI" -hp "Hewlett-Packard" "ScanJet 3c" "SCSI" -hp "Hewlett-Packard" "ScanJet 3p" "SCSI" -hp "Hewlett-Packard" "ScanJet 4c" "SCSI" -hp "Hewlett-Packard" "ScanJet 4p" "SCSI" -hp "Hewlett-Packard" "ScanJet 4100C" "USB" -hp "Hewlett-Packard" "ScanJet 5p" "SCSI" -hp "Hewlett-Packard" "ScanJet 5100C" "Parport" -hp "Hewlett-Packard" "ScanJet 5200C" "Parport USB" -hp "Hewlett-Packard" "ScanJet 6100C" "SCSI" -hp "Hewlett-Packard" "ScanJet 6200C" "SCSI USB" -hp "Hewlett-Packard" "ScanJet 6250C" "SCSI USB" -hp "Hewlett-Packard" "ScanJet 6300C" "SCSI USB" -hp "Hewlett-Packard" "ScanJet 6350C" "SCSI USB" -hp "Hewlett-Packard" "ScanJet 6390C" "SCSI USB" -hp "Hewlett-Packard" "PhotoSmart PhotoScanner" "SCSI" -hpsj5s "Hewlett-Packard" "ScanJet 5s" "Parport (EPP)" -leo "LEO" "LEOScan S3" "SCSI" -leo "Across Technologies" "FS-1130" "SCSI" -leo "Genius" "FS-1130 Colorpage Scanner" "SCSI" -matsushita "Panasonic" "KV-SS25" "SCSI" -matsushita "Panasonic" "KV-SS25D" "SCSI" -matsushita "Panasonic" "KV-SS50" "SCSI" -matsushita "Panasonic" "KV-SS55" "SCSI" -matsushita "Panasonic" "KV-SS50EX" "SCSI" -matsushita "Panasonic" "KV-SS55EX" "SCSI" -matsushita "Panasonic" "KV-SS850" "SCSI" -matsushita "Panasonic" "KV-SS855" "SCSI" -microtek "Microtek" "Scanmaker E6" "SCSI" -microtek "Microtek" "Scanmaker E3" "SCSI" -microtek "Microtek" "Scanmaker E2" "SCSI" -microtek "Microtek" "Scanmaker 35t+" "SCSI" -microtek "Microtek" "Scanmaker 45t" "SCSI" -microtek "Microtek" "Scanmaker 35" "SCSI" -microtek "Microtek" "Scanmaker III" "SCSI" -microtek "Microtek" "Scanmaker IISP" "SCSI" -microtek "Microtek" "Scanmaker IIHR" "SCSI" -microtek "Microtek" "Scanmaker IIG" "SCSI" -microtek "Microtek" "Scanmaker II" "SCSI" -microtek "Microtek" "Scanmaker 600Z(S)" "SCSI" -microtek "Microtek" "Scanmaker 600G(S)" "SCSI" -microtek "Microtek" "Color PageWiz" "SCSI (Parport)" -microtek "Agfa" "Arcus II" "SCSI" -microtek "Agfa" "StudioScan" "SCSI" -microtek "Agfa" "StudioScan II" "SCSI" -microtek "Agfa" "StudioScan IIsi" "SCSI" -microtek "Agfa" "DuoScan" "SCSI" -microtek2 "Microtek" "ScanMaker E3plus" "Parport" -microtek2 "Microtek" "ScanMaker E3plus" "SCSI" -microtek2 "Microtek" "ScanMaker X6" "SCSI" -microtek2 "Microtek" "ScanMaker X6EL" "SCSI" -microtek2 "Microtek" "ScanMaker X6USB" "USB" -microtek2 "Microtek" "ScanMaker V300" "SCSI" -microtek2 "Microtek" "ScanMaker V300" "Parport" -microtek2 "Microtek" "ScanMaker V310" "SCSI" -microtek2 "Microtek" "ScanMaker V310" "Parport" -microtek2 "Microtek" "ScanMaker V600" "SCSI" -microtek2 "Microtek" "ScanMaker V600" "Parport" -microtek2 "Microtek" "ScanMaker 330" "SCSI" -microtek2 "Microtek" "ScanMaker 630" "SCSI" -microtek2 "Microtek" "ScanMaker 636" "SCSI" -microtek2 "Microtek" "ScanMaker 9600XL" "SCSI" -microtek2 "Microtek" "ScanMaker 9600XL" "SCSI" -microtek2 "Microtek" "Phantom 330CX" "Parport" -microtek2 "Microtek" "SlimScan C3" "Parport" -microtek2 "Microtek" "Phantom 636" "SCSI" -microtek2 "Microtek" "Phantom 636CX" "Parport" -microtek2 "Microtek" "SlimScan C6" "USB" -microtek2 "Microtek" "ScanMaker V6USL" "SCSI" -microtek2 "Microtek" "ScanMaker V6USL" "USB" -microtek2 "Microtek" "ScanMaker X12USL" "SCSI" -microtek2 "Vobis" "HighScan" "SCSI" -microtek2 "Scanport" "SQ300" "Parport?" -microtek2 "Scanport" "SQ2030" "Parport" -microtek2 "Scanport" "SQ4836" "SCSI" -mustek "Mustek" "Paragon MFS-6000CX" "SCSI" -mustek "Mustek" "Paragon MFS-12000CX" "SCSI" -mustek "Mustek" "Paragon MFC-600S" "SCSI" -mustek "Mustek" "Paragon 600 II CD" "SCSI" -mustek "Mustek" "ScanMagic 600 II SP" "SCSI" -mustek "Mustek" "Paragon MFC-800S" "SCSI" -mustek "Mustek" "Paragon 800 II SP" "SCSI" -mustek "Mustek" "Paragon MFS-6000SP" "SCSI" -mustek "Mustek" "Paragon MFS-8000SP" "SCSI" -mustek "Mustek" "Paragon MFS-1200SP" "SCSI" -mustek "Mustek" "Paragon MFS-12000SP" "SCSI" -mustek "Mustek" "ScanExpress 6000SP" "SCSI" -mustek "Mustek" "ScanExpress 12000SP" "SCSI" -mustek "Mustek" "ScanExpress 12000SP Plus" "SCSI" -mustek "Mustek" "Paragon 1200 III SP" "SCSI" -mustek "Mustek" "Paragon 1200 LS" "SCSI" -mustek "Mustek" "ScanMagic 9636S" "SCSI" -mustek "Mustek" "ScanMagic 9636S Plus" "SCSI" -mustek "Mustek" "ScanExpress A3 SP" "SCSI" -mustek "Mustek" "Paragon 1200 SP Pro" "SCSI" -mustek "Mustek" "Paragon 1200 A3 Pro" "SCSI" -mustek "Mustek" "Paragon 600 II N" "Proprietary" -mustek "Trust" "Imagery 1200" "SCSI" -mustek "Trust" "Imagery 1200 SP" "SCSI" -mustek "Trust" "Imagery 4800 SP" "SCSI" -mustek "Trust" "SCSI Connect 19200" "SCSI" -mustek "Trust" "SCSI excellence series 19200" "SCSI" -mustek "Primax" "Compact 4800 SCSI" "SCSI" -mustek_pp "Mustek" "ScanExpress 6000 P" "Parport (EPP)" -mustek_pp "Mustek" "ScanExpress 600 SEP" "Parport (EPP)" -mustek_pp "Mustek" "ScanMagic 4800 P" "Parport (EPP)" -mustek_pp "Mustek" "600 III EP Plus" "Parport (EPP)" -mustek_pp "Mustek" "ScanExpress 600 CP" "Parport (EPP)" -mustek_pp "Mustek" "ScanMagic 600 CP" "Parport (EPP)" -mustek_pp "Mustek" "1200 CP" "Parport (EPP)" -mustek_pp "Mustek" "1200 CP+" "Parport (EPP)" -mustek_pp "Medion/Tevion/LifeTec" "MD 9848" "Parport (EPP)" -mustek_pp "Medion/Tevion/LifeTec" "MD/LT 935x" "Parport (EPP)" -mustek_pp "Medion/Tevion/LifeTec" "MD/LT 985x" "Parport (EPP)" -mustek_pp "Medion/Tevion/LifeTec" "MD/LT 9890" "Parport (EPP)" -mustek_pp "Targa" "Funline TS12 EP" "Parport (EPP)" -mustek_pp "Targa" "Funline TS6 EP" "Parport (EPP)" -mustek_pp "Trust Easy Connect" "9600+" "Parport (EPP)" -mustek_pp "Viviscan" "Compact II" "Parport (EPP)" -mustek_pp "Cybercom" "9352" "Parport (EPP)" -mustek_pp "Gallery" "4800" "Parport (EPP)" -mustek_usb "Mustek" "ScanExpress 600 CU" "USB" -mustek_usb "Mustek" "ScanExpress 1200 CU" "USB" -mustek_usb "Mustek" "ScanExpress 1200 CU Plus" "USB" -mustek_usb "Mustek" "ScanExpress 1200 UB" "USB" -mustek_usb "Trust" "Compact Scan USB 19200" "USB" -nec "NEC" "PC-IN500/4C" "SCSI" -pie "Devcom" "9636PRO" "SCSI" -pie "Devcom" "9636S" "SCSI" -pie "Devcom" "9630S" "SCSI" -pie "PIE" "ScanAce 1236S" "SCSI" -pie "PIE" "ScanAce 1230S" "SCSI" -pie "PIE" "ScanAce II" "SCSI" -pie "PIE" "ScanAce III" "SCSI" -pie "PIE" "ScanAce Plus" "SCSI" -pie "PIE" "ScanAce II Plus" "SCSI" -pie "PIE" "ScanAce III Plus" "SCSI" -pie "PIE" "ScanAce V" "SCSI" -pie "PIE" "ScanAce ScanMedia" "SCSI" -pie "PIE" "ScanAce ScanMedia II" "SCSI" -pie "PIE" "ScanAce 630S" "SCSI" -pie "PIE" "ScanAce 636S" "SCSI" -pie "Adlib" "JetScan630" "SCSI" -pie "Adlib" "JetScan636PRO" "SCSI" -plustek "Plustek" "OpticPro 4800P" "Parport (SPP, EPP)" -plustek "Plustek" "OpticPro 4830P" "Parport (SPP, EPP)" -plustek "Plustek" "OpticPro 600P/6000P" "Parport (SPP, EPP)" -plustek "Plustek" "OpticPro 4831P" "Parport (SPP, EPP)" -plustek "Plustek" "OpticPro 9630P" "Parport (SPP, EPP)" -plustek "Plustek" "OpticPro 9630PL" "Parport (SPP, EPP)" -plustek "Plustek" "OpticPro 9600P" "Parport (SPP, EPP)" -plustek "Plustek" "OpticPro 1236P" "Parport (SPP, EPP)" -plustek "Plustek" "OpticPro 12000P/96000P" "Parport (SPP, EPP)" -plustek "Plustek" "OpticPro 9636P" "Parport (SPP, EPP)" -plustek "Plustek" "OpticPro 9636P+/Turbo" "Parport (SPP, EPP)" -plustek "Plustek" "OpticPro 9636T" "Parport (SPP, EPP)" -plustek "Plustek" "OpticPro 12000T" "Parport (SPP, EPP)" -plustek "Plustek" "OpticPro AI3" "Parport (SPP, EPP)" -plustek "Plustek" "OpticPro P8" "Parport" -plustek "Plustek" "OpticPro P12" "Parport (SPP, EPP)" -plustek "Plustek" "OpticPro PT12" "Parport (SPP, EPP)" -plustek "Plustek" "OpticPro U12" "USB" -plustek "Plustek" "OpticPro UT12" "USB" -plustek "Plustek" "OpticPro UT16" "USB" -plustek "Plustek" "OpticPro U24" "USB" -plustek "Plustek" "OpticPro UT24" "USB" -plustek "Plustek" "OpticPro 19200S" "SCSI" -plustek "Primax" "Colorado 4800" "Parport (SPP, EPP)" -plustek "Primax" "Compact 4800 Direct" "Parport (SPP, EPP)" -plustek "Primax" "Compact 4800 Direct-30" "Parport (SPP, EPP)" -plustek "Primax" "Compact 9600 Direct-30" "Parport (SPP, EPP)" -plustek "Genius" "Colorpage Vivid III V2" "Parport (SPP, EPP)" -plustek "Genius" "Colorpage Vivid Pro II Film" "Parport (SPP, EPP)" -plustek "Genius" "Colorpage HR6 V2" "USB" -plustek "Genius" "Colorpage HR7" "USB" -plustek "Genius" "Colorpage HR6A" "USB" -plustek "Genius" "Colorpage HR7LE" "USB" -plustek "Genius" "Colorpage HR6X" "USB" -plustek "Aries" "Scan-It Pro 4800" "Parport (SPP, EPP)" -plustek "BrightScan" "BrighScan OpticPro" "Parport (SPP, EPP)" -plustek "Mustek" "BearPaw 1200" "USB" -plustek "Mustek" "BearPaw 2400" "USB" -plustek "Hewlett-Packard" "ScanJet 2100C" "USB" -plustek "Hewlett-Packard" "ScanJet 2200C" "USB" -plustek "Epson" "Perfection 1250" "USB" -plustek "Epson" "Perfection 1250Photo" "USB" -plustek "Epson" "Perfection 1260" "USB" -plustek "Epson" "Perfection 1260Photo" "USB" -plustek "Umax" "UMAX 3400" "USB" -plustek "Umax" "UMAX 5400" "USB" -plustek "Canon" "CanoScan N650U/N656U" "USB" -plustek "Canon" "CanoScan N1220U" "USB" -plustek "Canon" "CanoScan N670U/N676U" "USB" -plustek "Canon" "CanoScan N1240U" "USB" -plustek "Canon" "CanoScan LiDE20" "USB" -plustek "Canon" "CanoScan LiDE30" "USB" -qcam "Connectix" "Color QuickCam" "Parport" -qcam "Connectix" "Greyscale QuickCam" "Parport" -ricoh "Ricoh" "Ricoh IS50" "SCSI" -ricoh "Ricoh" "Ricoh IS60" "SCSI" -s9036 "Siemens" "9036 Flatbed scanner" "SCSI" -sceptre "Sceptre" "Vividscan S1200" "SCSI" -sceptre "Komodo" "S1200" "SCSI" -sharp "Sharp" "JX-610" "SCSI" -sharp "Sharp" "JX-250" "SCSI" -sharp "Sharp" "JX-320" "SCSI" -sharp "Sharp" "JX-325" "SCSI" -sharp "Sharp" "JX-330" "SCSI" -sharp "Sharp" "JX-350" "SCSI" -sm3600 "Microtek" "ScanMaker 3600" "USB" -sm3600 "Microtek" "ScanMaker 3700" "USB" -sm3600 "Microtek" "ScanMaker 3750" "USB" -SnapScan "AGFA" "SnapScan 300" "SCSI" -SnapScan "AGFA" "SnapScan 310" "SCSI" -SnapScan "AGFA" "SnapScan 600" "SCSI" -SnapScan "AGFA" "SnapScan 1236s" "SCSI" -SnapScan "AGFA" "SnapScan 1236u" "USB" -SnapScan "AGFA" "SnapScan 1212u" "USB" -SnapScan "AGFA" "SnapScan e10" "USB" -SnapScan "AGFA" "SnapScan e20" "USB" -SnapScan "AGFA" "SnapScan e25" "USB" -SnapScan "AGFA" "SnapScan e26" "USB" -SnapScan "AGFA" "SnapScan e40" "USB" -SnapScan "AGFA" "SnapScan e42" "USB" -SnapScan "AGFA" "SnapScan e50" "USB" -SnapScan "AGFA" "SnapScan e52" "USB" -SnapScan "AGFA" "SnapScan e60" "USB" -SnapScan "Benq" "300f" "SCSI" -SnapScan "Benq" "310s" "SCSI" -SnapScan "Benq" "610s" "SCSI" -SnapScan "Benq" "610plus" "SCSI" -SnapScan "Benq" "620s" "SCSI" -SnapScan "Benq" "310u" "USB" -SnapScan "Benq" "320u" "USB" -SnapScan "Benq" "340u" "USB" -SnapScan "Benq" "620u" "USB" -SnapScan "Benq" "640u" "USB" -SnapScan "Benq" "640bu" "USB" -SnapScan "Benq" "1240" "USB" -SnapScan "Benq" "3300" "USB" -SnapScan "Benq" "4300" "USB" -SnapScan "Benq" "5000" "USB" -SnapScan "Benq" "5300" "USB" -SnapScan "Guillemot / Hercules" "Maxi Scan A4 Deluxe (SCSI)" "SCSI" -SnapScan "Guillemot / Hercules" "Scan@home Touch 1248 (USB)" "USB" -SnapScan "Mitsubishi" "Diamondview 648UT" "USB" -SnapScan "Mitsubishi" "Diamondview 650U" "USB" -sp15c "Fujitsu" "SP15C" "SCSI" -st400 "Siemens" "ST400" "SCSI" -st400 "Siemens" "ST800" "SCSI" -tamarack "Tamarack" "Artiscan 6000C" "SCSI" -tamarack "Tamarack" "Artiscan 8000C" "SCSI" -tamarack "Tamarack" "Artiscan 12000C" "SCSI" -teco1 "Relisys" "RELI 2412" "SCSI" -teco1 "Relisys" "AVEC 2400" "SCSI" -teco1 "Relisys" "RELI 4830" "SCSI" -teco1 "Relisys" "AVEC 2412" "SCSI" -teco1 "Relisys" "AVEC 4800" "SCSI" -teco1 "Relisys" "AVEC 4816" "SCSI" -teco1 "Relisys" "RELI DS6" "SCSI" -teco1 "Relisys" "RELI DS15" "SCSI" -teco1 "Relisys" "RELI 2400" "SCSI" -teco1 "Relisys" "RELI 4816" "SCSI" -teco1 "Relisys" "RELI 9600" "SCSI" -teco1 "Relisys" "RELI 9612" "SCSI" -teco1 "Relisys" "RELI 9624" "SCSI" -teco1 "Relisys" "RELI 9630" "SCSI" -teco1 "Actown" "ACT Scan I 30" "SCSI" -teco1 "Dextra" "DF-600P" "SCSI" -teco1 "Dextra" "DF-1200T+" "SCSI" -teco1 "Dextra" "DF-4830T" "SCSI" -teco1 "Dextra" "DF-9624" "SCSI" -teco2 "Relisys" "AVEC Super 3" "SCSI" -teco2 "Relisys" "SCORPIO Super 3" "SCSI" -teco2 "Relisys" "APOLLO Express 6" "SCSI" -teco2 "Relisys" "SCORPIO Pro" "SCSI" -teco2 "Relisys" "SCORPIO Pro-S" "SCSI" -teco2 "Primax" "Profi 9600" "SCSI" -teco2 "Primax" "Profi 19200" "SCSI" -teco3 "Relisys" "Infinity Scorpio" "SCSI" -teco3 "Plustek" "OpticPro 2400SP" "SCSI" -teco3 "PIOTECH" "Splendeur 3024" "SCSI" -teco3 "Trust" "Imagery 2400 SP" "SCSI" -teco3 "Trust" "Imagery 4800 SP+" "SCSI" -teco3 "Trust" "Imagery 9600 SP" "SCSI" -umax "UMAX" "Vista S6" "SCSI" -umax "UMAX" "Vista S6E" "SCSI" -umax "UMAX" "UMAX S-6E" "SCSI" -umax "UMAX" "UMAX S-6EG" "SCSI" -umax "UMAX" "Vista-S8" "SCSI" -umax "UMAX" "Supervista S-12" "SCSI" -umax "UMAX" "UMAX S-12" "SCSI" -umax "UMAX" "UMAX S-12G" "SCSI" -umax "UMAX" "Astra 600S" "SCSI" -umax "UMAX" "Astra 610S" "SCSI" -umax "UMAX" "Astra 1200S" "SCSI" -umax "UMAX" "Astra 1220S" "SCSI" -umax "UMAX" "Astra 2100S" "SCSI" -umax "UMAX" "Astra 2200 (SU)" "SCSI" -umax "UMAX" "Astra 2200 (SU)" "USB" -umax "UMAX" "Astra 2400S" "SCSI" -umax "UMAX" "Astra 6400" "IEEE-1394" -umax "UMAX" "Astra 6450" "IEEE-1394" -umax "UMAX" "Astra MX3" "SCSI" -umax "UMAX" "Astra MX3" "USB" -umax "UMAX" "Mirage D-16L" "SCSI" -umax "UMAX" "Mirage II" "SCSI" -umax "UMAX" "Mirage IIse" "SCSI" -umax "UMAX" "PSD" "SCSI" -umax "UMAX" "PowerLook" "SCSI" -umax "UMAX" "PL-II" "SCSI" -umax "UMAX" "PowerLook III" "SCSI" -umax "UMAX" "PowerLook 270" "SCSI" -umax "UMAX" "PowerLook 270plus" "SCSI" -umax "UMAX" "PowerLook 1100" "IEEE-1394" -umax "UMAX" "PowerLook 2000" "SCSI" -umax "UMAX" "PowerLook 2100XL" "SCSI" -umax "UMAX" "PowerLook 3000" "SCSI" -umax "UMAX" "Gemini D-16" "SCSI" -umax "UMAX" "UMAX VT600" "SCSI" -umax "UMAX" "Vista-T630" "SCSI" -umax "UMAX" "UC 630" "SCSI" -umax "UMAX" "UG 630" "SCSI" -umax "UMAX" "UG 80" "SCSI" -umax "UMAX" "UC 840" "SCSI" -umax "UMAX" "UC 1200S" "SCSI" -umax "UMAX" "UC 1200SE" "SCSI" -umax "UMAX" "UC 1260" "SCSI" -umax "Linotype Hell" "Jade" "SCSI" -umax "Linotype Hell" "Jade" "SCSI" -umax "Linotype Hell" "Jade2" "SCSI" -umax "Linotype Hell" "Saphir" "SCSI" -umax "Linotype Hell" "Saphir2" "SCSI" -umax "Linotype Hell" "Saphir3" "SCSI" -umax "Linotype Hell" "Saphir Ultra" "SCSI" -umax "Linotype Hell" "Saphir Ultra II" "SCSI" -umax "Linotype Hell" "Saphir HiRes" "SCSI" -umax "Linotype Hell" "Opal" "SCSI" -umax "Linotype Hell" "Opal Ultra" "SCSI" -umax "Linotype Hell" "Linoscan 1400" "SCSI" -umax "Vobis" "Highscreen Scanboostar Premium" "SCSI" -umax "EDGE" "KTX-9600US" "SCSI" -umax "Epson" "Perfection 600" "SCSI" -umax "Escom" "Image Scanner 256" "SCSI" -umax "Escort" "Galleria 600" "SCSI" -umax "Genius" "ColorPage-HR5 (Pro)" "SCSI" -umax "Nikon" "AX-110 / Scantouch 110" "SCSI" -umax "Nikon" "AX-210" "SCSI" -umax1220u "UMAX" "Astra 1220U" "USB" -umax1220u "UMAX" "Astra 2000U" "USB" -umax1220u "UMAX" "Astra 2200U" "USB" -umax_pp "UMAX" "Astra 1220P" "Parport (EPP)" -umax_pp "UMAX" "Astra 2000P" "Parport (EPP)" -umax_pp "UMAX" "Astra 1600P" "Parport (EPP)" -umax_pp "UMAX" "Astra 610P" "Parport (EPP)" -umax_pp "Hewlett-Packard" "Scanjet 3200C" "Parport (EPP)" diff --git a/gosa-plugins/goto/admin/systems/goto/terminalService.tpl b/gosa-plugins/goto/admin/systems/goto/terminalService.tpl index 72ba28b1a..fd7cffcb7 100644 --- a/gosa-plugins/goto/admin/systems/goto/terminalService.tpl +++ b/gosa-plugins/goto/admin/systems/goto/terminalService.tpl @@ -191,17 +191,6 @@ -{/render} - - - - - - -{render acl=$gotoFontPathACL} - {/render} @@ -221,21 +210,6 @@ {/render} {t}Provide print services{/t} -
- - - - - - - -
-{render acl=$gotoLpdServerACL} - -{/render} -
  @@ -247,21 +221,6 @@ {/render} {t}Provide scan services{/t} -
- - - - - - -
-{render acl=$gotoScannerEnableACL} - -{/render} -
- -- 2.30.2