summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2c79724)
raw | patch | inline | side by side (parent: 2c79724)
author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Thu, 23 Nov 2006 06:02:37 +0000 (06:02 +0000) | ||
committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Thu, 23 Nov 2006 06:02:37 +0000 (06:02 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5201 594d385d-05f5-0310-b6e9-bd551577e9d8
plugins/admin/systems/class_terminalService.inc | patch | blob | history | |
plugins/admin/systems/terminalService.tpl | patch | blob | history |
diff --git a/plugins/admin/systems/class_terminalService.inc b/plugins/admin/systems/class_terminalService.inc
index 41371aac4c11c39e23e0b5ebb7c510032a088d28..fa8450efb208058620d6855d8f59bad2d7a4f4c5 100644 (file)
var $gotoScannerBackend= "";
var $goFonHardware= "automatic";
+ var $AutoSync = false;
+
/* Needed values and lists */
var $ignore_account= TRUE;
var $base= "";
}
}
}
+ if(preg_match("/\+/",$this->gotoXHsync)){
+ $this->AutoSync = true;
+ $this->gotoXHsync = preg_replace("/\+/","-",$this->gotoXHsync);
+ $this->gotoXVsync = preg_replace("/\+/","-",$this->gotoXVsync);
+ }
}
function execute()
$smarty->assign ("hardware_list", $hl);
$smarty->assign ("gotoXMonitor", $this->gotoXMonitor);
+ $smarty->assign("AutoSyncACL",$this->getacl("AutoSync"));
+
+ $smarty->assign("AutoSyncCHK"," ");
+ if($this->AutoSync){
+ $smarty->assign("AutoSyncCHK"," checked ");
+ $smarty->assign("gotoXVsyncACL", preg_replace("/w/","",$this->getacl("gotoXVsync")));
+ $smarty->assign("gotoXHsyncACL", preg_replace("/w/","",$this->getacl("gotoXHsync")));
+ }
+
/* Show main page */
return($smarty->fetch (get_template_path('terminalService.tpl', TRUE)));
}
}
}
}
+ }
+
+ if(isset($_POST['gotoXDriver'])){
+ if(isset($_POST['AutoSync'])){
+ $this->AutoSync = true;
+ }else{
+ $this->AutoSync = false;
+ }
+ }
+
+ /* Default entries can use blank hsync/vsync entries */
+ if ($this->dn != "" && $this->cn != "default" && $this->cn != "default"){
+
+ /* But only if no auto sync is enabled... */
+ if (!$this->AutoSync){
+
+ /* Check vsync for correct usage */
+ $val= preg_replace ("/\s/", "", $this->gotoXVsync);
+ if (!preg_match ("/^\d+(\.\d+)?([-]\d+(\.\d+)?)?$/", $val) && $this->acl_is_writeable("gotoXVsync")){
+
+ $message[]= _("Please specify a valid VSync range.");
+ } elseif ($this->acl_is_writeable("gotoXVsync")){
+ list($v1,$v2)= preg_split ("/[-+]/", $val);
+ if ($v2 != ""){
+ if ($v1 > $v2){
+ $message[]= _("Please specify a valid VSync range.");
+ }
+ }
+ }
+
+ /* Check hsync for correct usage */
+ $val= preg_replace ("/\s/", "", $this->gotoXHsync);
+ if (!preg_match ("/^\d+(\.\d+)?([-]\d+(\.\d+)?)?$/", $val) && $this->acl_is_writeable("gotoXHsync")){
+
+ $message[]= _("Please specify a valid HSync range.");
+ } elseif ($this->acl_is_writeable("gotoXHsync")){
+ list($v1,$v2)= preg_split ("/[-+]/", $val);
+ if ($v2 != ""){
+ if ($v1 > $v2){
+ $message[]= _("Please specify a valid HSync range.");
+ }
+ }
+ }
+ }
}
}
}
}
+ if($this->AutoSync){
+ $this->attrs['gotoXHsync'] = "30+55";
+ $this->attrs['gotoXVsync'] = "50+70";
+ }
+
/* Write back to ldap */
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->dn);
"gotoXColordepth" => _("Gfx color depth"),
"gotoXHsync" => _("Hsync"),
"gotoXVsync" => _("Vsync"),
+ "AutoSync" => _("Auto-Sync"),
"gotoLpdEnable" => _("Printer service enabled"),
"gotoLpdServer" => _("Spool server"),
"gotoScannerEnable" => _("Scanner enabled"),
"gotoScannerModel" => _("Scanner model"),
- "gotoScannerClients" => _(""),
- "gotoScannerBackend" => _(""),
+ "gotoScannerClients" => _("Heäh ? "),
+ "gotoScannerBackend" => _("..."),
"gotoXKbModel" => _("Keyboard model"),
"gotoXKbLayout" => _("Keyboard layout"),
"gotoXKbVariant" => _("Keyboard variant"),
index 9338f790528da97d7c0f4fae128139c0f6fc35b9..72ba28b1a4e7e78b6e6e0a8dc57ccc3baa0ef7cb 100644 (file)
<td>{t}Type{/t}</td>
<td>{$gotoXMonitor}</td>
</tr>
+ <tr>
+ <td>
+{render acl=$AutoSyncACL}
+ <input type="checkbox" name="AutoSync" value="1" {$AutoSyncCHK} onChange="changeState('gotoXHsync');changeState('gotoXVsync');">
+{/render}
+ </td>
+ <td>{t}Use DDC for automatic detection{/t}</td>
+ </tr>
<tr>
<td><LABEL for="gotoXHsync">{t}HSync{/t}</LABEL></td>
<td>