![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc
index 9a8659e62da74cd77976895e41b3d6b980a6c1e7..47369ae9aa3acf7d19584c3a9aaff3c1ddbaa2b7 100644 (file)
var $modes= array();
var $netConfigDNS;
+ var $baseSelector;
var $inheritTimeServer = true;
plugin::plugin ($config, $dn, $parent);
- if(class_available("krb_host_keys")){
- $this->kerberos_key_service = new krb_host_keys($this->config,$this);
+ if(class_available("krbHostKeys")){
+ $this->kerberos_key_service = new krbHostKeys($this->config,$this);
}
if(!isset($this->parent->by_object['ogroup'])){
}
$this->netConfigDNS = new termDNS($this->config,$this,$this->objectclasses);
+ $this->netConfigDNS->MACisMust =TRUE;
/* Check if this host is currently in installation process*/
if(class_available("gosaSupportDaemon") && class_available("DaemonEvent")){
/* Set base */
if ($this->dn == "new"){
$ui= get_userinfo();
- $this->base= dn2base($ui->dn);
- } else {
- $this->base= preg_replace ("/^[^,]+,".normalizePreg(get_ou("workstationou"))."/i", "", $this->dn);
+ $this->base= dn2base(session::global_is_set("CurrentMainBase")?"cn=dummy,".session::global_get("CurrentMainBase"):$ui->dn);
+ } elseif(preg_match("/".preg_quote(get_ou("systemIncomingRDN"), '/')."/i", $this->dn)){
+ $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou("systemIncomingRDN"), '/')."/i", "", $this->dn);
+ }else{
+ $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou("workstationRDN"), '/')."/i", "", $this->dn);
}
/* Create an array of all Syslog servers */
$this->orig_dn= $this->dn;
$this->orig_cn= $this->cn;
$this->orig_base= $this->base;
+
+ /* Instanciate base selector */
+ $this->baseSelector= new baseSelector($this->get_allowed_bases(), $this->base);
+ $this->baseSelector->setSubmitButton(false);
+ $this->baseSelector->setHeight(300);
+ $this->baseSelector->update(true);
}
return($display);
}
- /* Base select dialog */
- $once = true;
- foreach($_POST as $name => $value){
- if(preg_match("/^chooseBase/",$name) && $once && $this->acl_is_writeable("base")){
- $once = false;
- $this->dialog = new baseSelectDialog($this->config,$this,$this->get_allowed_bases());
- $this->dialog->setCurrentBase($this->base);
- }
- }
-
- /* Dialog handling */
- if(is_object($this->dialog)){
- /* Must be called before save_object */
- $this->dialog->save_object();
-
- if($this->dialog->isClosed()){
- $this->dialog = false;
- }elseif($this->dialog->isSelected()){
-
- /* A new base was selected, check if it is a valid one */
- $tmp = $this->get_allowed_bases();
- if(isset($tmp[$this->dialog->isSelected()])){
- $this->base = $this->dialog->isSelected();
- }
-
- $this->dialog= false;
- }else{
- return($this->dialog->execute());
- }
- }
-
/* Add new ntp Server to our list */
if((isset($_POST['addNtpServer'])) && (isset($_POST['gotoNtpServers'])) && $this->acl_is_writeable("gotoNtpServer")){
$this->gotoNtpServer[$_POST['gotoNtpServers']] = $_POST['gotoNtpServers'];
/* Fill templating stuff */
$smarty= get_smarty();
+ $smarty->assign("usePrototype", "true");
/* Set acls */
$tmp = $this->plInfo();
$smarty->assign("cn", $this->cn);
$smarty->assign("description", $this->description);
$smarty->assign("l", $this->l);
- $smarty->assign("bases", $this->get_allowed_bases());
$smarty->assign("staticAddress", "");
$tmp = array();
$smarty->assign("gotoNtpServers", $ntpser);
/* Variables */
- foreach(array("base", "gotoMode", "gotoSyslogServer", "gotoNtpServer") as $val){
+ foreach(array("gotoMode", "gotoSyslogServer", "gotoNtpServer") as $val){
$smarty->assign($val."_select", $this->$val);
}
+ $smarty->assign("base", $this->baseSelector->render());
/* tell smarty the inherit checkbox state */
$smarty->assign("inheritTimeServer",$this->inheritTimeServer);
plugin::save_object();
$this->base = $base_tmp;
- /* Save base, since this is no LDAP attribute */
- $tmp = $this->get_allowed_bases();
- if(isset($_POST['base'])){
- if(isset($tmp[$_POST['base']])){
- $this->base= $_POST['base'];
+ /* Refresh base */
+ if ($this->acl_is_moveable($this->base)){
+ if (!$this->baseSelector->update()) {
+ msg_dialog::display(_("Error"), msgPool::permMove(), ERROR_DIALOG);
+ }
+ if ($this->base != $this->baseSelector->getBase()) {
+ $this->base= $this->baseSelector->getBase();
+ $this->is_modified= TRUE;
}
}
$message= array_merge($message, $this->netConfigDNS->check());
}
- $this->dn= "cn=".$this->cn.",".get_ou('workstationou').$this->base;
+ $this->dn= "cn=".$this->cn.",".get_ou('workstationRDN').$this->base;
if ($this->cn == ""){
$message[]= msgPool::required(_("Name"));
$message[] = msgPool::invalid(_("Name"));
}
+ // Check if a wrong base was supplied
+ if(!$this->baseSelector->checkLastBaseUpdate()){
+ $message[]= msgPool::check_base();
+ }
+
if ($this->orig_dn != $this->dn){
$ldap= $this->config->get_ldap_link();
$ldap->cd ($this->base);
}
if ($ldap->count() != 0){
while ($attrs= $ldap->fetch()){
- if (preg_match("/cn=dhcp,/",$attrs['dn']) || preg_match ("/,".get_ou('incomingou')."/", $ldap->getDN())){
+ if (preg_match("/cn=dhcp,/",$attrs['dn']) || preg_match ("/,".preg_quote(get_ou('systemIncomingRDN'), '/')."/i", $ldap->getDN())){
continue;
} else {
if ($attrs['dn'] != $this->orig_dn){
}else{
/* Warn the user, that this host is currently installing */
if($this->currently_installing && !$this->currently_installing_warned &&
- !preg_match("/".normalizePreg(get_ou("incomingou"))."/",$this->orig_dn)){
+ !preg_match("/".preg_quote(get_ou("systemIncomingRDN"), '/')."/i",$this->orig_dn)){
/* Force aborting without message dialog */
$message[] = "";
}
}
+ /* cn=default and macAddress=- indicates that this is a template */
+ if($this->cn == "wdefault"){
+ $this->netConfigDNS->macAddress = "-";
+ }
+
/* Write back to ldap */
$ldap= $this->config->get_ldap_link();
if ($this->orig_dn == 'new'){
if (!$ldap->success()){
msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class()));
}
+
+ $this->netConfigDNS->cn = $this->cn;
+ $this->netConfigDNS->save();
+
$this->handle_post_events("add",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
} else {
if ($this->orig_dn != $this->dn){
msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_MOD, get_class()));
}
new log("modify","workstation/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
- $this->handle_post_events("modify",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
- }
- /* cn=default and macAddress=- indicates that this is a template */
- if($this->cn == "wdefault"){
- $this->netConfigDNS->macAddress = "-";
- }
+ $this->netConfigDNS->cn = $this->cn;
+ $this->netConfigDNS->save();
- $this->netConfigDNS->cn = $this->cn;
- $this->netConfigDNS->save();
+ $this->handle_post_events("modify",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
+ }
if ($activate && class_available("DaemonEvent")){
"gotoMode" => _("Goto mode"),
"gotoSyslogServer" => _("Syslog server"),
"gotoNtpServer" => _("Ntp server"),
- "gotoRootPasswd" => _("Root password"),
+ "userPassword" => _("Root password"),
+ "createFAICD" => _("Create FAI CD"),
"FAIstate" => _("Action flag"))
));
}
/* Set workstation service attributes to inherited */
if($this->member_of_ogroup && isset($this->parent->by_object['workservice'])){
- foreach(array("gotoXKbLayout","gotoXKbModel","gotoXKbVariant",
+ foreach(array("gotoXKbLayout","gotoXKbModel","gotoXKbVariant","gotoXDriver",
"gotoXResolution","gotoXColordepth","gotoXMouseType","gotoXMouseport") as $name){
- $this->parent->by_object['workservice']->$name = "default";
+ if($this->parent->by_object['workservice']->acl_is_writeable($name)){
+ $this->parent->by_object['workservice']->$name = "default";
+ }
}
}
/* Set workstation startup attributes to inherited */
if($this->member_of_ogroup && isset($this->parent->by_object['workstartup'])){
- $this->parent->by_object['workstartup']->gotoBootKernel = "default-inherited";
- $this->parent->by_object['workstartup']->gotoLdapServer = "default-inherited";
- $this->parent->by_object['workstartup']->FAIdebianMirror= "inherited";
+ $obj = $this->parent->by_object['workstartup'];
+ if($obj->acl_is_writeable("gotoBootKernel")){
+ $this->parent->by_object['workstartup']->gotoBootKernel = "default-inherited";
+ }
+ if($obj->acl_is_writeable("gotoLdapServer")){
+ $this->parent->by_object['workstartup']->gotoLdapServer = "default-inherited";
+ $this->parent->by_object['workstartup']->gotoLdap_inherit = TRUE;
+ $this->parent->by_object['workstartup']->gotoLdapServers = array();
+ }
+ if($obj->acl_is_writeable("FAIdebianMirror")){
+ $this->parent->by_object['workstartup']->FAIdebianMirror= "inherited";
+ }
}
}
+
+
+ function is_modal_dialog()
+ {
+ return((isset($this->dialog) && $this->dialog) || (isset($this->netConfigDNS->dialog) && $this->netConfigDNS->dialog));
+ }
+
+
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>