![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc
index eb1e4a60090478414228f6023403f04fdfe15e0c..37fdfc923bd08d1fe1b30a84dc60ef8a37f73a46 100644 (file)
/* Generic terminal attributes */
var $gotoMode= "locked";
var $gotoSyslogServer= "";
- var $gotoNtpServer= "";
+ var $gotoSyslogServers= array();
+ var $gotoNtpServer= array();
+ var $gotoNtpServers= array();
var $gotoSndModule= "";
var $gotoFloppyEnable= "";
var $gotoCdromEnable= "";
var $ghCpuType= "-";
var $ghMemSize= "-";
- var $macAddress= "";
- var $ipHostNumber= "";
var $ghUsbSupport= "-";
var $ghNetNic= array();
var $ghIdeDev= array();
var $ghGfxAdapter= "-";
var $ghSoundAdapter= "-";
var $gotoLastUser= "-";
+ var $FAIscript= "";
+ var $didAction= FALSE;
+ var $FAIstate= "";
/* Needed values and lists */
var $base= "";
/* Plugin side filled */
var $modes= array();
+ var $netConfigDNS;
+
+ var $inheritTimeServer = true;
+
/* attribute list for save action */
var $ignore_account= TRUE;
- var $attributes= array("gotoMode", "macAddress", "gotoSyslogServer", "gotoNtpServer",
+ var $attributes= array("gotoMode", "gotoSyslogServer", "gotoNtpServer",
"gotoFloppyEnable", "gotoCdromEnable", "cn", "gotoSndModule",
- "ghCpuType", "ghMemSize", "ghUsbSupport", "ipHostNumber",
- "ghGfxAdapter", "ghSoundAdapter", "gotoLastUser", "l");
- var $objectclasses= array("top", "gotoWorkstation", "GOhard");
+ "ghCpuType", "ghMemSize", "ghUsbSupport",
+ "ghGfxAdapter", "ghSoundAdapter", "gotoLastUser", "l","FAIscript");
+ var $objectclasses= array("top", "gotoWorkstation", "GOhard","FAIobject");
function workgeneric ($config, $dn= NULL)
{
plugin::plugin ($config, $dn);
-
- /* Load available modes */
- $ldap= $this->config->get_ldap_link();
- $ldap->cd ($this->config->current['BASE']);
- $ldap->search ("(objectClass=gotoInstallProfile)");
- while ($attrs= $ldap->fetch()){
- $this->modes[]= $attrs["cn"][0];
- }
+ $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses);
/* Read arrays */
foreach (array("ghNetNic", "ghIdeDev", "ghScsiDev") as $val){
}
}
+ /* Create used ntp server array */
+ $this->gotoNtpServer= array();
+ if(isset($this->attrs['gotoNtpServer'])){
+ $this->inheritTimeServer = false;
+ unset($this->attrs['gotoNtpServer']['count']);
+ foreach($this->attrs['gotoNtpServer'] as $server){
+ $this->gotoNtpServer[$server] = $server;
+ }
+ }
+
+ /* Set inherit checkbox state */
+ if((in_array("default",$this->gotoNtpServer)) || (count($this->gotoNtpServer) == 0)){
+ $this->inheritTimeServer = true;
+ $this->gotoNtpServer=array();
+ }
+
+ /* Create available ntp options */
+ $tmp = $this->config->data['SERVERS']['NTP'];
+ $this->gotoNtpServers = array();
+ foreach($tmp as $key => $server){
+ if($server == "default") continue;
+ $this->gotoNtpServers[$server] = $server;
+ }
+
$this->modes["active"]= _("Activated");
$this->modes["locked"]= _("Locked");
$this->modes["memcheck"]= _("Memory test");
$this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn);
}
+ /* Create an array of all Syslog servers */
+ $tmp = $this->config->data['SERVERS']['SYSLOG'];
+ foreach($tmp as $server){
+ $visible = $server;
+ if($server == "default") {
+ $visible = "["._("inherited")."]";
+ }
+ $this->gotoSyslogServers[$server] = $visible;
+ }
+
/* Save 'dn' for later referal */
$this->orig_dn= $this->dn;
}
function execute()
{
- /* Call parent execute */
- plugin::execute();
+ /* Call parent execute */
+ plugin::execute();
/* Do we need to flip is_account state? */
if (isset($_POST['modify_state'])){
if ($cmd == ""){
print_red(_("No ACTIONCMD definition found in your gosa.conf"));
} else {
- exec ($cmd." ".$this->macAddress." ".escapeshellarg($_POST['action']), $dummy, $retval);
+ exec ($cmd." ".$this->netConfigDNS->macAddress." ".escapeshellarg($_POST['saction']), $dummy, $retval);
if ($retval != 0){
print_red(sprintf(_("Execution of '%s' failed!"), $cmd));
+ } else {
+ $this->didAction= TRUE;
}
}
}
return($display);
}
+ /* Base select dialog */
+ $once = true;
+ foreach($_POST as $name => $value){
+ if(preg_match("/^chooseBase/",$name) && $once){
+ $once = false;
+ $this->dialog = new baseSelectDialog($this->config);
+ $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()){
+ $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->gotoNtpServer[$_POST['gotoNtpServers']] = $_POST['gotoNtpServers'];
+ }
+
+ /* Delete selected NtpServer for list of used servers */
+ if((isset($_POST['delNtpServer'])) && (isset($_POST['gotoNtpServerSelected']))){
+ foreach($_POST['gotoNtpServerSelected'] as $name){
+ unset($this->gotoNtpServer[$name]);
+ }
+ }
+
/* Fill templating stuff */
$smarty= get_smarty();
$smarty->assign("cn", $this->cn);
$smarty->assign("l", $this->l);
$smarty->assign("bases", $this->config->idepartments);
$smarty->assign("staticAddress", "");
+ $smarty->assign("gotoNtpServers",$this->gotoNtpServers);
/* Check if workstation is online */
$query= "fping -q -r 1 -t 500 ".$this->cn;
$smarty->assign("actions", array("halt" => _("Switch off"), "reboot" => _("Reboot"),
"instant_update" => _("Instant update"),
"update" => _("Scheduled update"),
- "update" => _("Reinstall"),
+ "reinstall" => _("Reinstall"),
"rescan" => _("Rescan hardware")));
} else {
$smarty->assign("actions", array("wake" => _("Wake up"),
+ "reinstall" => _("Reinstall"),
"update" => _("Scheduled update")));
}
/* Arrays */
$smarty->assign("modes", $this->modes);
$smarty->assign("nfsservers", $this->config->data['SERVERS']['NFS']);
- $smarty->assign("syslogservers", $this->config->data['SERVERS']['SYSLOG']);
+ $smarty->assign("syslogservers", $this->gotoSyslogServers);
$smarty->assign("ntpservers", $this->config->data['SERVERS']['NTP']);
/* Variables */
$smarty->assign($val."_select", $this->$val);
$smarty->assign($val."ACL", chkacl($this->acl, $val));
}
- $smarty->assign("ipHostNumber", $this->ipHostNumber);
- $smarty->assign("macAddress", $this->macAddress);
$smarty->assign("actionACL", chkacl($this->acl, 'action'));
+ /* tell smarty the inherit checkbox state */
+ $smarty->assign("inheritTimeServer",$this->inheritTimeServer);
+
/* Show main page */
- $smarty->assign("netconfig", dirname(__FILE__)."/network.tpl");
+ $smarty->assign("netconfig", $this->netConfigDNS->execute());
return($smarty->fetch (get_template_path('workstation.tpl', TRUE)));
}
function remove_from_parent()
{
+ $this->netConfigDNS->remove_from_parent();
$ldap= $this->config->get_ldap_link();
$ldap->rmdir($this->dn);
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), _("Removing workstation failed"));
/* Optionally execute a command after we're done */
- $this->handle_post_events("remove");
+ $this->handle_post_events("remove", array("macAddress" => $this->netConfigDNS->macAddress));
/* Delete references to object groups */
$ldap->cd ($this->config->current['BASE']);
unset($og->member[$this->dn]);
$og->save ();
}
-
}
if (isset($_POST['base']) && chkacl($this->acl, "create") == ""){
$this->base= $_POST['base'];
}
+ $this->netConfigDNS->save_object();
+
+ /* Set inherit mode */
+ if(isset($_POST['workgeneric_posted'])){
+ if(isset($_POST["inheritTimeServer"])){
+ $this->inheritTimeServer = true;
+ }else{
+ $this->inheritTimeServer = false;
+ }
+ }
+
}
/* Check supplied data */
function check()
{
- $message= array();
+ /* Call common method to give check the hook */
+ $message= plugin::check();
+ $message= array_merge($message, $this->netConfigDNS->check());
$ui= get_userinfo();
$this->dn= "cn=".$this->cn.",ou=workstations,ou=systems,".$this->base;
if ($this->orig_dn != $this->dn){
$ldap= $this->config->get_ldap_link();
$ldap->cd ($this->base);
- $ldap->search ("(cn=".$this->cn.")", array("cn"));
+ $ldap->search ("(&(cn=".$this->cn.")(objectClass=gotoWorkstation))", array("cn"));
if ($ldap->count() != 0){
while ($attrs= $ldap->fetch()){
if (preg_match ("/,ou=incoming,/", $ldap->getDN())){
}
}
}
+
+ /* Check for valid ntpServer selection */
+ if((!$this->inheritTimeServer) && (!count($this->gotoNtpServer))){
+ $message[]= _("There must be at least one NTP server selected, or the inherit mode activated.");
+ }
return ($message);
}
$this->attrs= $attrs;
}
+ /* Update ntp server settings */
+ if($this->inheritTimeServer){
+ $this->attrs['gotoNtpServer'] = array();
+ }else{
+ /* Set ntpServers */
+ $this->attrs['gotoNtpServer'] = array();
+ foreach($this->gotoNtpServer as $server){
+ $this->attrs['gotoNtpServer'][] = $server;
+ }
+ }
+
/* Write back to ldap */
$ldap= $this->config->get_ldap_link();
if ($this->orig_dn == 'new'){
$ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
$ldap->cd($this->dn);
$ldap->add($this->attrs);
- $this->handle_post_events("add");
+ if(!$this->didAction){
+ $this->handle_post_events("add");
+ }
} else {
if ($this->orig_dn != $this->dn){
$this->move($this->orig_dn, $this->dn);
}
$ldap->cd($this->dn);
- $ldap->modify($this->attrs);
- $this->handle_post_events("modify");
- }
- show_ldap_error($ldap->get_error());
+ $this->cleanup();
+ $ldap->modify ($this->attrs);
- /* Optionally execute a command after we're done */
- $this->postcreate();
+ if(!$this->didAction){
+ $this->handle_post_events("modify");
+ }
+ }
+ $this->netConfigDNS->cn = $this->cn;
+ $this->netConfigDNS->save($this->dn);
+ show_ldap_error($ldap->get_error(), _("Saving workstation failed"));
}
}