![[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 409316227b38153f6ac03cdc26e8b2970d1dddc1..64ba6e3b0f0861dd9974a2b97e78ff7b86e69f9e 100644 (file)
/* Generic terminal attributes */
var $gotoMode= "locked";
var $gotoSyslogServer= "";
+ var $gotoSyslogServers= array();
var $gotoNtpServer= array();
var $gotoNtpServers= array();
var $gotoSndModule= "";
"ghGfxAdapter", "ghSoundAdapter", "gotoLastUser", "l","FAIscript");
var $objectclasses= array("top", "gotoWorkstation", "GOhard","FAIobject");
- function workgeneric ($config, $dn= NULL)
+ var $mapActions = array("reboot" => "localboot",
+ "instant_update" => "softupdate",
+ "update" => "sceduledupdate",
+ "reinstall" => "install",
+ "rescan" => "",
+ "memcheck" => "memcheck",
+ "sysinfo" => "sysinfo");
+
+
+ var $fai_activated = FALSE;
+
+ function workgeneric ($config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn);
+ /* 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);
+ $this->netConfigDNS->acl = $this->acl;
/* Read arrays */
foreach (array("ghNetNic", "ghIdeDev", "ghScsiDev") as $val){
}
/* Set inherit checkbox state */
- if(in_array("default",$this->gotoNtpServer)){
+ if((in_array("default",$this->gotoNtpServer)) || (count($this->gotoNtpServer) == 0)){
$this->inheritTimeServer = true;
$this->gotoNtpServer=array();
}
/* Create available ntp options */
- $this->gotoNtpServers = $this->config->data['SERVERS']['NTP'];
- foreach($this->gotoNtpServers as $key => $server){
- if($server == "default"){
- unset($this->gotoNtpServers[$key]);
- }
+ $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->modes["sysinfo"]= _("System analysis");
/* Set base */
if ($this->dn == "new"){
$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;
}
{
/* Call parent execute */
plugin::execute();
+ $this->netConfigDNS->acl = $this->acl;
/* Do we need to flip is_account state? */
if (isset($_POST['modify_state'])){
$this->is_account= !$this->is_account;
}
- if (isset($_POST['action'])){
+ if (isset($_POST['action']) && chkacl($this->acl,"FAIstate") == ""){
$cmd= search_config($this->config->data['TABS'], "workgeneric", "ACTIONCMD");
if ($cmd == ""){
print_red(_("No ACTIONCMD definition found in your gosa.conf"));
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;
+ } elseif ($_POST['saction'] != "wake") {
+
+ 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();
+
+ $attrs = array();
+ $attrs['FAIstate'] = "";
+ if(isset($this->mapActions[$_POST['saction']])){
+ $attrs['FAIstate'] = $this->mapActions[$_POST ['saction']];
+ }
+
+ for($i = 0; $i < $res['objectClass']['count'] ; $i ++){
+ $attrs['objectClass'][] = $res['objectClass'][$i];
+ }
+
+ if(($attrs['FAIstate'] != "") && (!in_array("FAIobject",$attrs['objectClass']))){
+ $attrs['objectClass'][] = "FAIobject";
+ }
+
+ 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());
+
+ $this->didAction= TRUE;
+ }
}
}
}
}
/* Add new ntp Server to our list */
- if((isset($_POST['addNtpServer'])) && (isset($_POST['gotoNtpServers']))){
+ if((isset($_POST['addNtpServer'])) && (isset($_POST['gotoNtpServers'])) && chkacl($this->acl,"gotoNtpServer") == ""){
$this->gotoNtpServer[$_POST['gotoNtpServers']] = $_POST['gotoNtpServers'];
}
/* Delete selected NtpServer for list of used servers */
- if((isset($_POST['delNtpServer'])) && (isset($_POST['gotoNtpServerSelected']))){
+ if((isset($_POST['delNtpServer'])) && (isset($_POST['gotoNtpServerSelected'])) && chkacl($this->acl,"gotoNtpServer") == ""){
foreach($_POST['gotoNtpServerSelected'] as $name){
unset($this->gotoNtpServer[$name]);
}
$query= "fping -q -r 1 -t 500 ".$this->cn;
exec ($query, $dummy, $retval);
+ foreach($this->attributes as $attrs ){
+ $smarty->assign($attrs."ACL",chkacl($this->acl,$attrs));
+ }
+
/* Offline */
if ($retval == 0){
$smarty->assign("actions", array("halt" => _("Switch off"), "reboot" => _("Reboot"),
"instant_update" => _("Instant update"),
"update" => _("Scheduled update"),
"reinstall" => _("Reinstall"),
- "rescan" => _("Rescan hardware")));
+ "rescan" => _("Rescan hardware"),
+ "memcheck" => _("Memory test"),
+ "sysinfo" => _("System analysis")));
} else {
$smarty->assign("actions", array("wake" => _("Wake up"),
"reinstall" => _("Reinstall"),
- "update" => _("Scheduled update")));
+ "update" => _("Scheduled update"),
+ "memcheck" => _("Memory test"),
+ "sysinfo" => _("System analysis")));
}
/* 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("inheritTimeServer",$this->inheritTimeServer);
/* Show main page */
+ $this->netConfigDNS->cn= $this->cn;
$smarty->assign("netconfig", $this->netConfigDNS->execute());
+ $smarty->assign("fai_activated",$this->fai_activated);
return($smarty->fetch (get_template_path('workstation.tpl', TRUE)));
}
function remove_from_parent()
{
+ $this->netConfigDNS->acl = $this->acl;
$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", array("macAddress" => $this->netConfigDNS->macAddress));
$this->netConfigDNS->save_object();
/* Set inherit mode */
- if(isset($_POST['workgeneric_posted'])){
+ if(isset($_POST['workgeneric_posted']) && chkacl($this->acl,"gotoNtpServer") == ""){
if(isset($_POST["inheritTimeServer"])){
$this->inheritTimeServer = true;
}else{
$this->inheritTimeServer = false;
}
}
-
}
{
/* Call common method to give check the hook */
$message= plugin::check();
- $message= array_merge($message, $this->netConfigDNS->check());
+
+ if($this->cn != "wdefault"){
+ $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.")(objectClass=gotoWorkstation))", array("cn"));
+
+ if($this->cn == "wdefault"){
+ $ldap->cat($this->dn);
+ }else{
+ $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.");
/* Save to LDAP */
function save()
{
+ $this->netConfigDNS->acl = $this->acl;
plugin::save();
/* Strip out 'default' values */
foreach (array("gotoSyslogServer") as $val){
-
- if ($this->attrs[$val] == "default"){
+ if (!isset($this->attrs[$val]) || $this->attrs[$val] == "default"){
$this->attrs[$val]= array();
}
}
/* Update ntp server settings */
if($this->inheritTimeServer){
- $this->attrs['gotoNtpServer'] = "default";
+ if($this->new){
+ if(isset($this->attrs['gotoNtpServer'])){
+ unset($this->attrs['gotoNtpServer']);
+ }
+ }else{
+ $this->attrs['gotoNtpServer'] = array();
+ }
}else{
/* Set ntpServers */
$this->attrs['gotoNtpServer'] = array();
}
}
+ if(($this->gosaUnitTag) && (!in_array_ics("gosaAdministrativeUnitTag",$this->attrs['objectClass']))){
+ $this->attrs['objectClass'][] = "gosaAdministrativeUnitTag";
+ }
+
/* 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);
+ show_ldap_error($ldap->get_error(), _("Saving workstation failed"));
if(!$this->didAction){
$this->handle_post_events("add");
}
}
$ldap->cd($this->dn);
$this->cleanup();
-$ldap->modify ($this->attrs);
+ $ldap->modify ($this->attrs);
if(!$this->didAction){
$this->handle_post_events("modify");
}
}
+
+ /* Set macAddress to '-' this indicates that this is a Workstation Template */
+ if($this->cn == "wdefault"){
+ $this->netConfigDNS->macAddress = "-";
+ }
+
$this->netConfigDNS->cn = $this->cn;
$this->netConfigDNS->save($this->dn);
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), _("Saving workstation failed"));
}
}