diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc
index dd1c25f32699abd0b37205f4ccf0baa955366cf5..64ba6e3b0f0861dd9974a2b97e78ff7b86e69f9e 100644 (file)
var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
/* Generic terminal attributes */
var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
/* Generic terminal attributes */
- var $gotoMode= "disabled";
- var $gotoTerminalPath= "";
- var $gotoSwapServer= "";
+ var $gotoMode= "locked";
var $gotoSyslogServer= "";
var $gotoSyslogServer= "";
- var $gotoNtpServer= "";
+ var $gotoSyslogServers= array();
+ var $gotoNtpServer= array();
+ var $gotoNtpServers= array();
var $gotoSndModule= "";
var $gotoFloppyEnable= "";
var $gotoCdromEnable= "";
var $ghCpuType= "-";
var $ghMemSize= "-";
var $gotoSndModule= "";
var $gotoFloppyEnable= "";
var $gotoCdromEnable= "";
var $ghCpuType= "-";
var $ghMemSize= "-";
- var $macAddress= "";
- var $ipHostNumber= "";
var $ghUsbSupport= "-";
var $ghNetNic= array();
var $ghIdeDev= array();
var $ghUsbSupport= "-";
var $ghNetNic= array();
var $ghIdeDev= array();
var $ghGfxAdapter= "-";
var $ghSoundAdapter= "-";
var $gotoLastUser= "-";
var $ghGfxAdapter= "-";
var $ghSoundAdapter= "-";
var $gotoLastUser= "-";
-
+ var $FAIscript= "";
+ var $didAction= FALSE;
+ var $FAIstate= "";
/* Needed values and lists */
var $base= "";
var $cn= "";
/* Needed values and lists */
var $base= "";
var $cn= "";
+ var $l= "";
var $orig_dn= "";
/* Plugin side filled */
var $modes= array();
var $orig_dn= "";
/* Plugin side filled */
var $modes= array();
+ var $netConfigDNS;
+
+ var $inheritTimeServer = true;
+
/* attribute list for save action */
/* attribute list for save action */
- var $attributes= array("gotoMode", "gotoTerminalPath", "macAddress",
- "gotoSwapServer", "gotoSyslogServer", "gotoNtpServer",
+ var $ignore_account= TRUE;
+ var $attributes= array("gotoMode", "gotoSyslogServer", "gotoNtpServer",
"gotoFloppyEnable", "gotoCdromEnable", "cn", "gotoSndModule",
"gotoFloppyEnable", "gotoCdromEnable", "cn", "gotoSndModule",
- "ghCpuType", "ghMemSize", "ghUsbSupport", "ipHostNumber",
- "ghGfxAdapter", "ghSoundAdapter", "gotoLastUser");
- 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);
+ var $mapActions = array("reboot" => "localboot",
+ "instant_update" => "softupdate",
+ "update" => "sceduledupdate",
+ "reinstall" => "install",
+ "rescan" => "",
+ "memcheck" => "memcheck",
+ "sysinfo" => "sysinfo");
- /* 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];
+
+ var $fai_activated = FALSE;
+
+ function workgeneric ($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);
+ $this->netConfigDNS->acl = $this->acl;
+
/* Read arrays */
foreach (array("ghNetNic", "ghIdeDev", "ghScsiDev") as $val){
if (!isset($this->attrs[$val])){
/* Read arrays */
foreach (array("ghNetNic", "ghIdeDev", "ghScsiDev") as $val){
if (!isset($this->attrs[$val])){
}
}
}
}
- $this->modes["disabled"]= _("disabled");
- $this->modes["text"]= _("text");
- $this->modes["graphic"]= _("graphic");
+ /* 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");
/* Set base */
if ($this->dn == "new"){
/* Set base */
if ($this->dn == "new"){
$this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn);
}
$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()
{
/* Save 'dn' for later referal */
$this->orig_dn= $this->dn;
}
function execute()
{
+ /* 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;
}
/* Do we need to flip is_account state? */
if (isset($_POST['modify_state'])){
$this->is_account= !$this->is_account;
}
- if (isset($_POST['action'])){
- switch($_POST['saction']){
- case 'wake':
- $cmd= $this->search($this->config->data['TABS'], "terminfo", "WAKECMD");
- if ($cmd == ""){
- print_red(_("No WAKECMD definition found in your gosa.conf"));
- } else {
- exec ($cmd." ".$this->macAddress, $dummy, $retval);
- if ($retval != 0){
- print_red(sprintf(_("Execution of '%s' failed!"), $cmd));
+ 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"));
+ } else {
+ exec ($cmd." ".$this->netConfigDNS->macAddress." ".escapeshellarg($_POST['saction']), $dummy, $retval);
+ if ($retval != 0){
+ print_red(sprintf(_("Execution of '%s' failed!"), $cmd));
+ } 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']];
}
}
- }
- break;
- case 'reboot':
- $cmd= $this->search($this->config->data['TABS'], "terminfo", "REBOOTCMD");
- if ($cmd == ""){
- print_red(_("No REBOOTCMD definition found in your gosa.conf"));
- } else {
- exec ($cmd." ".$this->cn, $dummy, $retval);
- if ($retval != 0){
- print_red(sprintf(_("Execution of '%s' failed!"), $cmd));
+ for($i = 0; $i < $res['objectClass']['count'] ; $i ++){
+ $attrs['objectClass'][] = $res['objectClass'][$i];
}
}
- }
- break;
- case 'halt':
- $cmd= $this->search($this->config->data['TABS'], "terminfo", "HALTCMD");
- if ($cmd == ""){
- print_red(_("No HALTCMD definition found in your gosa.conf"));
- } else {
- exec ($cmd." ".$this->cn, $dummy, $retval);
- if ($retval != 0){
- print_red(sprintf(_("Execution of '%s' failed!"), $cmd));
+ 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;
}
}
- break;
+ }
}
}
/* Do we represent a valid terminal? */
if (!$this->is_account && $this->parent == NULL){
}
}
/* Do we represent a valid terminal? */
if (!$this->is_account && $this->parent == NULL){
- $display= "<img src=\"images/stop.png\" align=middle> <b>".
+ $display= "<img alt=\"\" src=\"images/stop.png\" align=middle> <b>".
_("This 'dn' has no workstation features.")."</b>";
return($display);
}
_("This 'dn' has no workstation features.")."</b>";
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'])) && 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'])) && chkacl($this->acl,"gotoNtpServer") == ""){
+ foreach($_POST['gotoNtpServerSelected'] as $name){
+ unset($this->gotoNtpServer[$name]);
+ }
+ }
+
/* Fill templating stuff */
$smarty= get_smarty();
$smarty->assign("cn", $this->cn);
/* Fill templating stuff */
$smarty= get_smarty();
$smarty->assign("cn", $this->cn);
+ $smarty->assign("l", $this->l);
$smarty->assign("bases", $this->config->idepartments);
$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;
exec ($query, $dummy, $retval);
/* Check if workstation is online */
$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){
/* Offline */
if ($retval == 0){
- $smarty->assign("actions", array("halt" => _("Switch off"), "reboot" => _("Reboot")));
+ $smarty->assign("actions", array("halt" => _("Switch off"), "reboot" => _("Reboot"),
+ "instant_update" => _("Instant update"),
+ "update" => _("Scheduled update"),
+ "reinstall" => _("Reinstall"),
+ "rescan" => _("Rescan hardware"),
+ "memcheck" => _("Memory test"),
+ "sysinfo" => _("System analysis")));
} else {
} else {
- $smarty->assign("actions", array("wake" => _("Wake up")));
+ $smarty->assign("actions", array("wake" => _("Wake up"),
+ "reinstall" => _("Reinstall"),
+ "update" => _("Scheduled update"),
+ "memcheck" => _("Memory test"),
+ "sysinfo" => _("System analysis")));
}
/* Arrays */
$smarty->assign("modes", $this->modes);
$smarty->assign("nfsservers", $this->config->data['SERVERS']['NFS']);
}
/* 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("ntpservers", $this->config->data['SERVERS']['NTP']);
/* Variables */
- foreach(array("base", "gotoMode", "gotoTerminalPath", "gotoSwapServer",
- "gotoSyslogServer", "gotoNtpServer") as $val){
-
+ foreach(array("base", "gotoMode", "gotoSyslogServer", "gotoNtpServer") as $val){
$smarty->assign($val."_select", $this->$val);
$smarty->assign($val."ACL", chkacl($this->acl, $val));
}
$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'));
$smarty->assign("actionACL", chkacl($this->acl, 'action'));
+ /* tell smarty the inherit checkbox state */
+ $smarty->assign("inheritTimeServer",$this->inheritTimeServer);
+
/* Show main page */
/* Show main page */
- $smarty->assign("netconfig", dirname(__FILE__)."/network.tpl");
+ $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()
{
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);
$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 */
/* 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']);
/* Delete references to object groups */
$ldap->cd ($this->config->current['BASE']);
unset($og->member[$this->dn]);
$og->save ();
}
unset($og->member[$this->dn]);
$og->save ();
}
-
}
}
if (isset($_POST['base']) && chkacl($this->acl, "create") == ""){
$this->base= $_POST['base'];
}
if (isset($_POST['base']) && chkacl($this->acl, "create") == ""){
$this->base= $_POST['base'];
}
-
- /* Save terminal path to parent since it is used by termstartup, too */
- $this->parent->by_object['termstartup']->gotoTerminalPath=
- $this->gotoTerminalPath;
+ $this->netConfigDNS->save_object();
+
+ /* Set inherit mode */
+ if(isset($_POST['workgeneric_posted']) && chkacl($this->acl,"gotoNtpServer") == ""){
+ if(isset($_POST["inheritTimeServer"])){
+ $this->inheritTimeServer = true;
+ }else{
+ $this->inheritTimeServer = false;
+ }
+ }
}
/* Check supplied data */
function check()
{
}
/* Check supplied data */
function check()
{
- $message= array();
+ /* Call common method to give check the hook */
+ $message= plugin::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;
$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);
if ($this->orig_dn != $this->dn){
$ldap= $this->config->get_ldap_link();
$ldap->cd ($this->base);
- $ldap->search ("(cn=".$this->cn.")", 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())){
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);
}
return ($message);
}
/* Save to LDAP */
function save()
{
/* Save to LDAP */
function save()
{
+ $this->netConfigDNS->acl = $this->acl;
plugin::save();
/* Strip out 'default' values */
plugin::save();
/* Strip out 'default' values */
- foreach (array("gotoTerminalPath", "gotoSwapServer", "gotoSyslogServer") as $val){
-
- if ($this->attrs[$val] == "default"){
+ foreach (array("gotoSyslogServer") as $val){
+ if (!isset($this->attrs[$val]) || $this->attrs[$val] == "default"){
$this->attrs[$val]= array();
}
}
$this->attrs[$val]= array();
}
}
$this->attrs= $attrs;
}
$this->attrs= $attrs;
}
+ /* Update ntp server settings */
+ if($this->inheritTimeServer){
+ if($this->new){
+ if(isset($this->attrs['gotoNtpServer'])){
+ unset($this->attrs['gotoNtpServer']);
+ }
+ }else{
+ $this->attrs['gotoNtpServer'] = array();
+ }
+ }else{
+ /* Set ntpServers */
+ $this->attrs['gotoNtpServer'] = array();
+ foreach($this->gotoNtpServer as $server){
+ $this->attrs['gotoNtpServer'][] = $server;
+ }
+ }
+
+ 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'){
/* 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);
$ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
$ldap->cd($this->dn);
$ldap->add($this->attrs);
- $this->handle_post_events("add");
+ show_ldap_error($ldap->get_error(), _("Saving workstation failed"));
+ 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);
} 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");
+ $this->cleanup();
+ $ldap->modify ($this->attrs);
+
+ if(!$this->didAction){
+ $this->handle_post_events("modify");
+ }
}
}
- show_ldap_error($ldap->get_error());
- /* Optionally execute a command after we're done */
- $this->postcreate();
+ /* 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(), _("Saving workstation failed"));
}
}
}
}