From: cajus Date: Wed, 8 Oct 2008 13:20:16 +0000 (+0000) Subject: Removed printer dialog from workstations X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=49ea0f5dbb055c5f5e0c70fad33aa5222241261a;p=gosa.git Removed printer dialog from workstations git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12630 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc index 619691360..e7c5feeaa 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc @@ -3,7 +3,6 @@ class workservice extends plugin { var $gotoScannerEnable; - var $gotoLpdEnable = array(); /* Generic terminal attributes */ var $gotoXMonitor= ""; @@ -37,8 +36,7 @@ class workservice extends plugin /* attribute list for save action */ - var $attributes= array("gotoXMonitor","gotoLpdEnable", - "gotoXDriver", "gotoXResolution", "gotoXColordepth", + var $attributes= array("gotoXMonitor", "gotoXDriver", "gotoXResolution", "gotoXColordepth", "gotoXHsync", "gotoXVsync", "gotoScannerEnable", "gotoScannerClients", "gotoScannerBackend", "gotoXKbModel", "gotoXKbLayout", "gotoXKbVariant", @@ -63,15 +61,6 @@ class workservice extends plugin "1400x1050" => "1400x1050", "1600x1200" => "1600x1200"); - /* Load gotoLpdEnable - */ - $this->gotoLpdEnable = array(); - if(isset($this->attrs['gotoLpdEnable']['count'])){ - for($i = 0 ; $i < $this->attrs['gotoLpdEnable']['count']; $i ++){ - $this->gotoLpdEnable[] = $this->attrs['gotoLpdEnable'][$i]; - } - } - if($this->config->get_cfg_value("resolutions") != ""){ $file = $this->config->get_cfg_value("resolutions"); @@ -262,40 +251,6 @@ class workservice extends plugin } } - - /********** - gotoLpdEnable - **********/ - if(isset($_POST['gotoLpdEnable_Close'])){ - $this->dialog = NULL; - } - - if(isset($_POST['gotoLpdEnable_Ok'])){ - $this->dialog->save_object(); - $msgs = $this->dialog->check(); - if(count($msgs)) { - msg_dialog::displayChecks($msgs); - }else{ - $this->gotoLpdEnable = $this->dialog->save(); - $this->dialog = NULL; - } - } - - if(isset($_POST['gotoLpdEnable_Edit'])){ - $this->dialog = new gotoLpdEnable($this->config,$this->gotoLpdEnable,$this); - } - - if($this->dialog instanceof plugin){ - $this->dialog->save_object(); - return($this->dialog->execute()); - } - - - /********** - Ende: gotoLpdEnable - **********/ - - /* Show main page */ $smarty= get_smarty(); @@ -539,7 +494,6 @@ class workservice extends plugin "gotoXVsync" => _("VSync"), "AutoSync" => _("Use DDC"), "gotoScannerEnable" => _("Scanner enabled"), - "gotoLpdEnable" => _("Printer enabled"), "gotoXKbModel" => _("Keyboard model"), "gotoXKbLayout" => _("Keyboard layout"), "gotoXKbVariant" => _("Keyboard variant"), diff --git a/gosa-plugins/goto/admin/systems/goto/workstationService.tpl b/gosa-plugins/goto/admin/systems/goto/workstationService.tpl index 82539c3af..19d3896b1 100644 --- a/gosa-plugins/goto/admin/systems/goto/workstationService.tpl +++ b/gosa-plugins/goto/admin/systems/goto/workstationService.tpl @@ -205,13 +205,6 @@ {/render} {t}Provide scan services{/t} -
-
-

{t}Printer{/t}

- -{render acl=$gotoLpdEnableACL} - -{/render}