X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Fgoto%2Fadmin%2Fsystems%2Fgoto%2Fclass_terminalGeneric.inc;h=ca979e91b47e4d36a41d20cab4d8180397f90820;hb=5d32604e6d8c506c3f3119e88e474c0271a4db57;hp=08565d4d76ae74a09efc36026edee2350828b321;hpb=0b3e33758ef85e92e61ef83a79faa86d5544429e;p=gosa.git
diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
index 08565d4d7..ca979e91b 100644
--- a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
@@ -23,6 +23,7 @@ class termgeneric extends plugin
var $ghSoundAdapter= "-";
var $gotoLastUser= "-";
var $netConfigDNS;
+ var $auto_activate= FALSE;
/* Needed values and lists */
var $base= "";
@@ -36,6 +37,7 @@ class termgeneric extends plugin
/* Plugin side filled */
var $modes= array();
+ var $baseSelector;
/* attribute list for save action */
var $ignore_account= TRUE;
@@ -59,25 +61,24 @@ class termgeneric extends plugin
function termgeneric (&$config, $dn= NULL, $parent= NULL)
{
/* Check if FAI is activated */
- $tmp= $config->search("faiManagement", "CLASS",array('menu','tabs'));
- if(!empty($tmp)){
- $this->fai_activated = TRUE;
- }
+ $this->fai_activated = $config->pluginEnabled("faiManagement");
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'])){
$ldap = $this->config->get_ldap_link();
$ldap->cd ($this->config->current['BASE']);
- $ldap->search("(&(objectClass=gotoWorkstationTemplate)(member=".LDAP::prepare4filter($this->dn)."))",array("cn"));
+ $ldap->search("(&(|(objectClass=gotoTerminalTemplate)(objectClass=gotoWorkstationTemplate))(member=".LDAP::prepare4filter($this->dn)."))",array("cn"));
$this->member_of_ogroup = $ldap->count() >= 1;
}
$this->netConfigDNS = new termDNS($this->config,$this,$this->objectclasses);
+ $this->netConfigDNS->MACisMust =TRUE;
+
/* Read arrays */
foreach (array("ghNetNic", "ghIdeDev", "ghScsiDev") as $val){
if (!isset($this->attrs[$val])){
@@ -123,9 +124,11 @@ class termgeneric extends plugin
/* Set base */
if ($this->dn == "new"){
$ui= get_userinfo();
- $this->base= dn2base($ui->dn);
+ $this->base= dn2base(session::global_is_set("CurrentMainBase")?"cn=dummy,".session::global_get("CurrentMainBase"):$ui->dn);
+ } elseif(preg_match("/".preg_quote(get_ou("ArpNewDevice", "systemIncomingRDN"), '/')."/i", $this->dn)){
+ $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou("ArpNewDevice", "systemIncomingRDN"), '/')."/i", "", $this->dn);
} else {
- $this->base= preg_replace ("/^[^,]+,".normalizePreg(get_ou("terminalou"))."/", "", $this->dn);
+ $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou("termgeneric", "terminalRDN"), '/')."/i", "", $this->dn);
}
/* Create an array of all Syslog servers */
@@ -141,6 +144,12 @@ class termgeneric extends plugin
$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);
}
function set_acl_base($base)
@@ -193,36 +202,6 @@ class termgeneric extends plugin
}
- /* Base select dialog */
- $once = true;
- foreach($_POST as $name => $value){
- if(preg_match("/^chooseBase/",$name) && $once && $this->acl_is_moveable()){
- $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());
- }
- }
-
/* Do we represent a valid terminal? */
if (!$this->is_account && $this->parent === NULL){
$display= "![\"\"](\"images/small-error.png\")
".
@@ -244,6 +223,7 @@ class termgeneric extends plugin
/* Fill templating stuff */
$smarty= get_smarty();
+
$tmp = $this->plInfo();
foreach($tmp['plProvidedAcls'] as $name => $translation){
@@ -252,9 +232,6 @@ class termgeneric extends plugin
$smarty->assign("cn", $this->cn);
$smarty->assign("description", $this->description);
- $smarty->assign("staticAddress", "");
-
- $smarty->assign("bases", $this->get_allowed_bases());
/* tell smarty the inherit checkbox state */
$smarty->assign("inheritTimeServer",$this->inheritTimeServer);
@@ -263,17 +240,32 @@ class termgeneric extends plugin
if (gosaSupportDaemon::ping($this->netConfigDNS->macAddress)){
$smarty->assign("actions", array( "halt" => _("Switch off"),
"reboot" => _("Reboot"),
- "memcheck" => _("Memory test"),
- "sysinfo" => _("System analysis")));
+ #"memcheck" => _("Memory test"),
+ #"sysinfo" => _("System analysis")
+ ));
} else {
$smarty->assign("actions", array("wake" => _("Wake up"),
- "memcheck" => _("Memory test"),
- "sysinfo" => _("System analysis")));
+ #"memcheck" => _("Memory test"),
+ #"sysinfo" => _("System analysis")
+ ));
}
/* Arrays */
$smarty->assign("modes", $this->modes);
+ $tmp2 = array();
+ $tmp2['!']= _("Local swap");
+ foreach($this->config->data['SERVERS']['NBD'] as $server){
+ if($server != "default"){
+ $tmp2[$server]= $server;
+ }else{
+ if($this->member_of_ogroup){
+ $tmp2[$server]="["._("inherited")."]";
+ }
+ }
+ }
+
+ $smarty->assign("swapservers", $tmp2);
$tmp2 = array();
foreach($this->config->data['SERVERS']['NFS'] as $server){
if($server != "default"){
@@ -299,9 +291,10 @@ class termgeneric extends plugin
$smarty->assign("fai_activated",$this->fai_activated);
/* Variables */
- foreach(array("base", "gotoMode", "gotoTerminalPath", "gotoSwapServer","gotoSyslogServer", "gotoNtpServer") as $val){
+ foreach(array("gotoMode", "gotoTerminalPath", "gotoSwapServer","gotoSyslogServer", "gotoNtpServer") as $val){
$smarty->assign($val."_select", $this->$val);
}
+ $smarty->assign("base", $this->baseSelector->render());
$smarty->assign("member_of_ogroup",$this->member_of_ogroup);
@@ -378,11 +371,14 @@ class termgeneric extends plugin
plugin::save_object();
$this->base = $base_tmp;
- /* Set new base if allowed */
- $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;
}
}
@@ -424,12 +420,17 @@ class termgeneric extends plugin
}
/* Permissions for that base? */
- $this->dn= "cn=".$this->cn.",".get_ou('terminalou').$this->base;
+ $this->dn= "cn=".$this->cn.",".get_ou("termgeneric", "terminalRDN").$this->base;
if ($this->cn == ""){
$message[]= msgPool::required(_("Name"));
}
+ // Check if a wrong base was supplied
+ if(!$this->baseSelector->checkLastBaseUpdate()){
+ $message[]= msgPool::check_base();
+ }
+
/* Check if given name is a valid host/dns name */
if(!tests::is_dns_name($this->cn) ){
$message[] = msgPool::invalid(_("Name"));
@@ -447,7 +448,7 @@ class termgeneric extends plugin
}
if ($ldap->count() != 0){
while ($attrs= $ldap->fetch()){
- if (preg_match("/cn=dhcp,/",$attrs['dn']) || preg_match ("/,".normalizePreg(get_ou('incomingou'))."/", $ldap->getDN())){
+ if (preg_match("/cn=dhcp,/",$attrs['dn']) || preg_match ("/,".preg_quote(get_ou("ArpNewDevice", "systemIncomingRDN"), '/')."/i", $ldap->getDN())){
continue;
} else {
if ($attrs['dn'] != $this->orig_dn){
@@ -482,8 +483,38 @@ class termgeneric extends plugin
/* Detect mode changes */
$activate= (isset($this->saved_attributes['gotoMode']) &&
$this->gotoMode != $this->saved_attributes['gotoMode'] &&
- $this->gotoMode == "enabled" &&
- tests::is_ip($this->netConfigDNS->ipHostNumber));
+ $this->gotoMode == "active" &&
+ tests::is_ip($this->netConfigDNS->ipHostNumber)) || $this->auto_activate;
+
+ /* Find proper terminal path for tftp configuration
+ FIXME: This is suboptimal when the default has changed to
+ another location! */
+ if ($this->gotoTerminalPath == "default"){
+ $ldap= $this->config->get_ldap_link();
+
+ /* Strip relevant part from dn, keep trailing ',' */
+ $tmp= preg_replace("/^cn=[^,]+,".preg_quote(get_ou("termgeneric", "terminalRDN"), '/')."/i", "", $this->dn);
+ $tmp= preg_replace("/".$this->config->current['BASE']."$/i", "", $tmp);
+
+ /* Walk from top to base and try to load default values for
+ 'gotoTerminalPath'. Abort when an entry is found. */
+ while (TRUE){
+ $tmp= preg_replace ("/^[^,]+,/", "", $tmp);
+
+ $ldap->cat("cn=default,".get_ou("termgeneric", "terminalRDN").$tmp.
+ $this->config->current['BASE'], array('gotoTerminalPath'));
+ $attrs= $ldap->fetch();
+ if (isset($attrs['gotoTerminalPath'])){
+ $this->gotoTerminalPath= $attrs['gotoTerminalPath'][0];
+ break;
+ }
+
+ /* Nothing left? */
+ if ($tmp == ""){
+ break;
+ }
+ }
+ }
plugin::save();
@@ -523,6 +554,11 @@ class termgeneric extends plugin
}
}
+ /* cn=default and macAddress=- indicates that this is a template */
+ if($this->cn == "default"){
+ $this->netConfigDNS->macAddress = "-";
+ }
+
/* Write back to ldap */
$ldap= $this->config->get_ldap_link();
if ($this->orig_dn == 'new'){
@@ -534,12 +570,20 @@ class termgeneric extends plugin
}
$ldap->add($this->attrs);
new log("create","terminal/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
+
+ $this->netConfigDNS->cn = $this->cn;
+ $this->netConfigDNS->save();
+
$this->handle_post_events("add",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
} else {
$ldap->cd($this->dn);
$this->cleanup();
$ldap->modify ($this->attrs);
new log("modify","terminal/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
+
+ $this->netConfigDNS->cn = $this->cn;
+ $this->netConfigDNS->save();
+
$this->handle_post_events("modify",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
/* Update all accessTo/trust dependencies */
@@ -548,13 +592,6 @@ class termgeneric extends plugin
}
}
- /* cn=default and macAddress=- indicates that this is a template */
- if($this->cn == "default"){
- $this->netConfigDNS->macAddress = "-";
- }
-
- $this->netConfigDNS->cn = $this->cn;
- $this->netConfigDNS->save();
if (!$ldap->success()){
msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class()));
}
@@ -639,17 +676,35 @@ class termgeneric extends plugin
"plPriority" => 1,
"plSection" => array("administration"),
"plCategory" => array("terminal" => array( "description" => _("Terminal"),
- "objectClass" => "gotoTerminal")),
+ "objectClass" => "gotoTerminal")),
+ "plProperties" =>
+ array(
+ array(
+ "name" => "terminalRDN",
+ "type" => "rdn",
+ "default" => "ou=terminals,ou=systems,",
+ "description" => _("The 'terminalRDN' statement defines the location where new terminals will be created. The default is 'ou=terminals,ou=systems,'."),
+ "check" => "gosaProperty::isRdn",
+ "migrate" => "migrate_terminalRDN",
+ "group" => "plugin",
+ "mandatory" => FALSE
+ )
+ ),
+
"plProvidedAcls"=> array(
+ "cn" => _("Name"),
+ "description" => _("Description"),
+ "base" => _("Base"),
+
"gotoMode" => _("Mode"),
+ "gotoSyslogServer" => _("Syslog server enabled"),
+
"gotoTerminalPath" => _("Root server"),
"gotoSwapServer" => _("Swap server"),
- "gotoSyslogServer" => _("Syslog server enabled"),
+
"gotoNtpServer" => _("Ntp server settings"),
- "base" => _("Base"),
- "cn" => _("Name"),
- "description" => _("Description"),
- "gotoRootPasswd" => _("Root password"),
+ "userPassword" => _("Root password"),
+
"FAIstate" => _("Action flag"))
));
}
@@ -664,7 +719,7 @@ class termgeneric extends plugin
/* Set workstation service attributes to inherited */
if($this->member_of_ogroup && isset($this->parent->by_object['termservice'])){
- foreach(array("gotoXKbLayout","gotoXKbModel","gotoXKbVariant",
+ foreach(array("gotoXKbLayout","gotoXKbModel","gotoXKbVariant","gotoXDriver",
"gotoXResolution","gotoXColordepth","gotoXMouseType","gotoXMouseport") as $name){
$this->parent->by_object['termservice']->$name = "default";
}
@@ -674,8 +729,17 @@ class termgeneric extends plugin
if($this->member_of_ogroup && isset($this->parent->by_object['termstartup'])){
$this->parent->by_object['termstartup']->gotoBootKernel = "default-inherited";
$this->parent->by_object['termstartup']->gotoLdapServer = "default-inherited";
+ $this->parent->by_object['termstartup']->gotoLdap_inherit = TRUE;
+ $this->parent->by_object['termstartup']->gotoLdapServers = array();
}
}
+
+
+ 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: