diff --git a/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc b/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc
index b5c8e3488a8c06a191593def1f3958031191f15a..f42eb7dbd1fabc9f33a204290ba549072476ac21 100644 (file)
var $XKbLayouts =array();
var $XKbVariants =array();
- var $InheritXYSync = FALSE;
+ var $InheritXYSync = TRUE;
function workservice (&$config, $dn= NULL, $parent= NULL)
{
}
}
- if(isset($this->attrs['gotoXHsync']) && isset($this->attrs['gotoXYsync'])) {
- $this->InheritXYSync = FALSE;
+ if(preg_match("/\+/",$this->gotoXHsync)){
+ $this->AutoSync = true;
+ $this->gotoXHsync = preg_replace("/\+/","-",$this->gotoXHsync);
+ $this->gotoXVsync = preg_replace("/\+/","-",$this->gotoXVsync);
+ }
+
+ if (isset($this->attrs['gotoXHsync']) && isset($this->attrs['gotoXVsync'])) {
+ if(!empty($this->attrs['gotoXHsync'][0]) && !empty($this->attrs['gotoXVsync'][0])) {
+ $this->InheritXYSync = FALSE;
+ }
}
/* Workaround to fill in inherited values if we've specified an objectclass */
if($this->InheritXYSync) {
$this->attrs['gotoXHsync'] = array();
$this->attrs['gotoXVsync'] = array();
- }
-
- if($this->AutoSync){
+ } elseif ($this->AutoSync) {
$this->attrs['gotoXHsync'] = "30+55";
$this->attrs['gotoXVsync'] = "50+70";
}