diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index 5a9f52357e450a8afc5acdb9c24874c07f9759b9..66500df3464b8721d69cf4b2b7e56a95d7551b39 100644 (file)
$this->gotoNtpServer=array();
}
$this->gotoNtpServer=array();
}
+ /* You can't inherit the NTP service, if we are not member in an object group */
+ if(!$this->member_of_ogroup){
+ $this->inheritTimeServer = FALSE;
+ }
+
/* Create available ntp options */
$this->gotoNtpServers = $this->config->data['SERVERS']['NTP'];
foreach($this->gotoNtpServers as $key => $server){
/* Create available ntp options */
$this->gotoNtpServers = $this->config->data['SERVERS']['NTP'];
foreach($this->gotoNtpServers as $key => $server){
$tmp = $this->config->data['SERVERS']['SYSLOG'];
foreach($tmp as $server){
$visible = $server;
$tmp = $this->config->data['SERVERS']['SYSLOG'];
foreach($tmp as $server){
$visible = $server;
- if($server == "default") {
+ if($server == "default" && $this->member_of_ogroup) {
$visible = "["._("inherited")."]";
}
$this->gotoSyslogServers[$server] = $visible;
$visible = "["._("inherited")."]";
}
$this->gotoSyslogServers[$server] = $visible;
if($server != "default"){
$tmp2[$server]= $server;
}else{
if($server != "default"){
$tmp2[$server]= $server;
}else{
- $tmp2[$server]="["._("inherited")."]";
+ if($this->member_of_ogroup){
+ $tmp2[$server]="["._("inherited")."]";
+ }
}
}
}
}
plugin::save_object();
$this->netConfigDNS->save_object();
plugin::save_object();
$this->netConfigDNS->save_object();
- if(isset($_POST["inheritAll"])){
- $this->set_everything_to_inherited();
- }
-
/* Save base, since this is no LDAP attribute */
if (isset($_POST['base']) && chkacl($this->acl, "create") == ""){
$this->base= $_POST['base'];
/* Save base, since this is no LDAP attribute */
if (isset($_POST['base']) && chkacl($this->acl, "create") == ""){
$this->base= $_POST['base'];
}
if(isset($_POST['termgeneric_posted']) && chkacl($this->acl,"gotoNtpServer") == ""){
}
if(isset($_POST['termgeneric_posted']) && chkacl($this->acl,"gotoNtpServer") == ""){
- if(isset($_POST["inheritTimeServer"])){
+ if(isset($_POST["inheritTimeServer"]) && $this->member_of_ogroup){
$this->inheritTimeServer = true;
}else{
$this->inheritTimeServer = false;
}
}
$this->inheritTimeServer = true;
}else{
$this->inheritTimeServer = false;
}
}
+
+ if(isset($_POST["inheritAll"])){
+ $this->set_everything_to_inherited();
+ }
+
}
}
function set_everything_to_inherited()
{
function set_everything_to_inherited()
{
+ $this->gotoTerminalPath = "default";
+ $this->gotoSwapServer = "default" ;
+ $this->gotoSyslogServer = "default";
+ $this->inheritTimeServer = TRUE;
+
/* Set workstation service attributes to inherited */
if($this->member_of_ogroup && isset($this->parent->by_object['termservice'])){
foreach(array("gotoXKbLayout","gotoXKbModel","gotoXKbVariant",
/* Set workstation service attributes to inherited */
if($this->member_of_ogroup && isset($this->parent->by_object['termservice'])){
foreach(array("gotoXKbLayout","gotoXKbModel","gotoXKbVariant",
- "gotoXResolution","gotoXColordepth","gotoXMouseType","gotoXMouseType") as $name){
+ "gotoXResolution","gotoXColordepth","gotoXMouseType","gotoXMouseport") as $name){
$this->parent->by_object['termservice']->$name = "default";
}
}
$this->parent->by_object['termservice']->$name = "default";
}
}