diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index 3872b38242e3a26077814f9b704a4a571581c661..69a5872fd5e2b2ab5a6222322f157d5f4e920c20 100644 (file)
"sysinfo" => "sysinfo");
- function termgeneric ($config, $dn= NULL)
+ function termgeneric ($config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn);
+ plugin::plugin ($config, $dn, $parent);
$this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses);
/* Read arrays */
foreach (array("ghNetNic", "ghIdeDev", "ghScsiDev") as $val){
$ldap->cd($this->dn);
$ldap->modify($attrs);
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), sprintf(_("Saving of system terminal/generic (FAIstate) with dn '%s' failed."),$this->dn));
switch($_POST['saction']){
case 'wake':
foreach($_POST as $name => $value){
if(preg_match("/^chooseBase/",$name) && $once){
$once = false;
- $this->dialog = new baseSelectDialog($this->config);
+ $this->dialog = new baseSelectDialog($this->config,$this);
$this->dialog->setCurrentBase($this->base);
}
}
$tmp2 = array();
foreach($this->config->data['SERVERS']['NFS'] as $server){
if($server != "default"){
- $tmp = split("\|",$server);
- $tmp3= split(":",$tmp[0]);
-
- $servername = $tmp3[0];
- $nfsname = $tmp3[1];
-
- $path ="";
- if(isset($tmp[4])){
- $path = $tmp[4];
- }
-
- $tmp2[$servername.":".$path]= $servername.":".$path;
+ $tmp2[$server]= $server;
}else{
$tmp2[$server]="["._("inherited")."]";
}
}
$smarty->assign("nfsservers", $tmp2);
+ $smarty->assign("syslogservers", $this->gotoSyslogServers);
+ $tmp = array();
+ foreach($this->gotoNtpServers as $server){
+ if(!in_array($server,$this->gotoNtpServer)){
+ $tmp[$server] = $server;
+ }
+ }
-
- $smarty->assign("syslogservers", $this->gotoSyslogServers);
- $smarty->assign("ntpservers", $this->gotoNtpServers);
+ $smarty->assign("ntpservers", $tmp);
/* Variables */
foreach(array("base", "gotoMode", "gotoTerminalPath", "gotoSwapServer",
if($ldap->count()){
$this->netConfigDNS->remove_from_parent();
$ldap->rmDir($this->dn);
- show_ldap_error($ldap->get_error(), _("Removing terminal failed"));
+ show_ldap_error($ldap->get_error(), sprintf(_("Removing of object system terminal/generic with dn '%s' failed."),$this->dn));
/* Optionally execute a command after we're done */
$this->handle_post_events("remove", array("macAddress" => $this->netConfigDNS->macAddress));
$this->attrs= $attrs;
}
- if($this->inheritTimeServer){
- $this->attrs['gotoNtpServer'] = array();
- }else{
- /* Set ntpServers */
- $this->attrs['gotoNtpServer'] = array();
+ /* Set ntpServers */
+ $this->attrs['gotoNtpServer'] = array();
+ if(!$this->inheritTimeServer){
foreach($this->gotoNtpServer as $server){
$this->attrs['gotoNtpServer'][] = $server;
}
$ldap->cd($this->config->current['BASE']);
$ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
$ldap->cd($this->dn);
+ if (!count($this->attrs['gotoNtpServer'])){
+ unset($this->attrs['gotoNtpServer']);
+ }
$ldap->add($this->attrs);
$this->handle_post_events("add");
} else {
}
$this->netConfigDNS->cn = $this->cn;
$this->netConfigDNS->save($this->dn);
- show_ldap_error($ldap->get_error(), _("Saving terminal failed"));
+ show_ldap_error($ldap->get_error(), sprintf(_("Saving of object system terminal/generic with dn '%s' failed."),$this->dn));
/* Optionally execute a command after we're done */
$this->postcreate();
}
+
+ /* Return plugin informations for acl handling */
+ function plInfo()
+ {
+ return (array(
+ "plShortName" => _("Terminal"),
+ "plDescription" => _("Terminal generic"),
+ "plSelfModify" => FALSE,
+ "plDepends" => array(),
+ "plPriority" => 0,
+ "plSection" => array("administration"),
+ "plCategory" => array("terminal" => array( "description" => _("Terminal"),
+ "objectClass" => "gotoTerminal")),
+ "plProvidedAcls"=> array(
+ "gotoMode" => _("Mode"),
+ "gotoTerminalPath" => _("Root server"),
+ "gotoSwapServer" => _("Swap server"),
+ "gotoSyslogServer" => _("Syslog server enabled"),
+ "gotoNtpServer" => _("Ntp server settings"),
+ "base" => _("Base"),
+ "cn" => _("Name"),
+ "FAIstate" => _("Action flag"))
+ ));
+ }
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: