diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index f87becda7cafe67d1d273170c7e29d0ac8ee9bc7..7a12d4ef91850ea358a49027ec11c368992167cc 100644 (file)
"memcheck" => "memcheck",
"sysinfo" => "sysinfo");
"memcheck" => "memcheck",
"sysinfo" => "sysinfo");
+ var $fai_activated = FALSE;
function termgeneric ($config, $dn= NULL, $parent= NULL)
{
function termgeneric ($config, $dn= NULL, $parent= NULL)
{
+ /* Check if FAI is activated */
+ $tmp = search_config($config->data,"faiManagement","CLASS");
+ if(!empty($tmp)){
+ $this->fai_activated = TRUE;
+ }
+
plugin::plugin ($config, $dn, $parent);
$this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses);
/* Read arrays */
plugin::plugin ($config, $dn, $parent);
$this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses);
/* Read arrays */
if (isset($_POST['action'])){
if (isset($_POST['action'])){
- /* Set FAIstate */
- $ldap = $this->config->get_ldap_link();
- $ldap->cd($this->config->current['BASE']);
- $ldap->cat($this->dn,array("objectClass"));
- $res = $ldap->fetch();
- $attrs = array();
- $attrs['FAIstate'] = "";
- if(isset($this->mapActions[$_POST['saction']])){
- $attrs['FAIstate'] = $this->mapActions[$_POST ['saction']];
- }
+ if($this->fai_activated && $this->dn != "new"){
+ /* Set FAIstate */
+ $ldap = $this->config->get_ldap_link();
+ $ldap->cd($this->config->current['BASE']);
+ $ldap->cat($this->dn,array("objectClass"));
+ $res = $ldap->fetch();
- for($i = 0; $i < $res['objectClass']['count'] ; $i ++){
- $attrs['objectClass'][] = $res['objectClass'][$i];
- }
+ $attrs = array();
+ $attrs['FAIstate'] = "";
+ if(isset($this->mapActions[$_POST['saction']])){
+ $attrs['FAIstate'] = $this->mapActions[$_POST ['saction']];
+ }
- if(($attrs['FAIstate'] != "") && (!in_array("FAIobject",$attrs['objectClass']))){
- $attrs['objectClass'][] = "FAIobject";
- }
+ for($i = 0; $i < $res['objectClass']['count'] ; $i ++){
+ $attrs['objectClass'][] = $res['objectClass'][$i];
+ }
- if($attrs['FAIstate'] == ""){
- #FIXME we should check if FAIobject is used anymore
- $attrs['FAIstate'] = array();
- }
+ if(($attrs['FAIstate'] != "") && (!in_array("FAIobject",$attrs['objectClass']))){
+ $attrs['objectClass'][] = "FAIobject";
+ }
- $ldap->cd($this->dn);
- $ldap->modify($attrs);
- show_ldap_error($ldap->get_error());
+ if($attrs['FAIstate'] == ""){
+#FIXME we should check if FAIobject is used anymore
+ $attrs['FAIstate'] = array();
+ }
+
+ $ldap->cd($this->dn);
+ $ldap->modify($attrs);
+ show_ldap_error($ldap->get_error());
+ }
switch($_POST['saction']){
case 'wake':
switch($_POST['saction']){
case 'wake':
}
/* Show main page */
}
/* Show main page */
+ $this->netConfigDNS->cn= $this->cn;
$smarty->assign("netconfig", $this->netConfigDNS->execute());
$smarty->assign("netconfig", $this->netConfigDNS->execute());
+ $smarty->assign("fai_activated",$this->fai_activated);
$smarty->assign("actionACL", chkacl($this->acl, 'action'));
return($smarty->fetch (get_template_path('terminal.tpl', TRUE)));
}
$smarty->assign("actionACL", chkacl($this->acl, 'action'));
return($smarty->fetch (get_template_path('terminal.tpl', TRUE)));
}
}
/* Save terminal path to parent since it is used by termstartup, too */
}
/* Save terminal path to parent since it is used by termstartup, too */
+ if(isset($this->parent->by_object['termstartup'])){
$this->parent->by_object['termstartup']->gotoTerminalPath=
$this->gotoTerminalPath;
$this->parent->by_object['termstartup']->gotoTerminalPath=
$this->gotoTerminalPath;
+ }
if(isset($_POST['termgeneric_posted'])){
if(isset($_POST["inheritTimeServer"])){
if(isset($_POST['termgeneric_posted'])){
if(isset($_POST["inheritTimeServer"])){
{
/* Call common method to give check the hook */
$message= plugin::check();
{
/* Call common method to give check the hook */
$message= plugin::check();
- $message= array_merge($message, $this->netConfigDNS->check());
+
+ if($this->cn != "default"){
+ $message= array_merge($message, $this->netConfigDNS->check());
+ }
/* Permissions for that base? */
/* Permissions for that base? */
- $this->dn= "cn=".$this->cn."ou=terminals,ou=systems,".$this->base;
+ $this->dn= "cn=".$this->cn.",ou=terminals,ou=systems,".$this->base;
$ui= get_userinfo();
$acl= get_permissions ($this->dn, $ui->subtreeACL);
$ui= get_userinfo();
$acl= get_permissions ($this->dn, $ui->subtreeACL);
if ($this->orig_dn == 'new'){
$ldap= $this->config->get_ldap_link();
if ($this->orig_dn == 'new'){
$ldap= $this->config->get_ldap_link();
- $ldap->cd ($this->base);
- $ldap->search ("(&(objectClass=gotoTerminal)(cn=".$this->cn."))", array("cn"));
+ $ldap->cd ($this->config->current['BASE']);
+
+ /* It is possible to have a 'default' terminal on every base */
+ if($this->cn == "default"){
+ $ldap->cat($this->dn);
+ }else{
+ $ldap->search ("(&(objectClass=gotoTerminal)(cn=".$this->cn."))", array("cn"));
+ }
+
+ /* Check if there are some other terminals found */
if ($ldap->count() != 0){
while ($attrs= $ldap->fetch()){
if (preg_match ("/,ou=incoming,/", $ldap->getDN())){
if ($ldap->count() != 0){
while ($attrs= $ldap->fetch()){
if (preg_match ("/,ou=incoming,/", $ldap->getDN())){
/* Save to LDAP */
function save()
{
/* Save to LDAP */
function save()
{
+
+ /* Move object if requested */
+ if( $this->orig_dn != 'new' && $this->dn != $this->orig_dn){
+ $this->move($this->orig_dn, $this->dn);
+ }
+
plugin::save();
/* Strip out 'default' values */
plugin::save();
/* Strip out 'default' values */
$ldap->add($this->attrs);
$this->handle_post_events("add");
} else {
$ldap->add($this->attrs);
$this->handle_post_events("add");
} else {
- if ($this->orig_dn != $this->dn){
- $this->move($this->orig_dn, $this->dn);
- }
$ldap->cd($this->dn);
$this->cleanup();
$ldap->modify ($this->attrs);
$ldap->cd($this->dn);
$this->cleanup();
$ldap->modify ($this->attrs);
-
$this->handle_post_events("modify");
}
$this->handle_post_events("modify");
}
+
+ /* 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($this->dn);
show_ldap_error($ldap->get_error(), _("Saving terminal failed"));
$this->netConfigDNS->cn = $this->cn;
$this->netConfigDNS->save($this->dn);
show_ldap_error($ldap->get_error(), _("Saving terminal failed"));