X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_servGeneric.inc;h=9c0f48cd1f442c63d0434f2fffc556b7810f816f;hb=78fd52f682986d25fb95c171757d58384f7f58f8;hp=ea9bc6956c30a196bf73dfc6b7daf0c453d871d2;hpb=d7fd69b22dc6a6614c574f953e22fff953205209;p=gosa.git
diff --git a/plugins/admin/systems/class_servGeneric.inc b/plugins/admin/systems/class_servGeneric.inc
index ea9bc6956..9c0f48cd1 100644
--- a/plugins/admin/systems/class_servGeneric.inc
+++ b/plugins/admin/systems/class_servGeneric.inc
@@ -15,19 +15,34 @@ class servgeneric extends plugin
var $base= "";
var $cn= "";
var $l= "";
- var $macAddress= "";
- var $ipHostNumber= "";
var $description= "";
var $orig_dn= "";
+ var $didAction= FALSE;
/* attribute list for save action */
- var $attributes= array("cn", "description", "macAddress", "ipHostNumber");
- var $objectclasses= array("top", "goServer");
+ var $attributes= array("cn", "description","gotoMode");
+ var $objectclasses= array("top", "GOhard", "goServer");
+
+ var $gotoMode= "locked";
+
+ var $netConfigDNS;
+ var $modes = array();
+
+ var $mapActions = array("reboot" => "",
+ "instant_update" => "softupdate",
+ "update" => "sceduledupdate",
+ "reinstall" => "install",
+ "rescan" => "",
+ "memcheck" => "memcheck",
+ "sysinfo" => "sysinfo");
function servgeneric ($config, $dn= NULL)
{
plugin::plugin ($config, $dn);
+ $this->modes["active"]= _("Activated");
+ $this->modes["locked"]= _("Locked");
+
/* Set base */
if ($this->dn == "new"){
$ui= get_userinfo();
@@ -36,13 +51,16 @@ class servgeneric extends plugin
} else {
$this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn);
}
-
+ $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses);
/* Save dn for later references */
$this->orig_dn= $this->dn;
}
function execute()
{
+ /* Call parent execute */
+ plugin::execute();
+
/* Do we represent a valid server? */
if (!$this->is_account && $this->parent == NULL){
$display= "![\"\"](\"images/stop.png\")
".
@@ -52,42 +70,71 @@ class servgeneric extends plugin
/* Check for action */
if (isset($_POST['action'])){
- switch($_POST['action']){
- case 'wake':
- $cmd= $this->search($this->config->data['TABS'], "servgeneric", "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));
- }
+ $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));
+ } else {
+ $this->didAction= TRUE;
+
+ /* 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'], "servgeneric", "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'], "servgeneric", "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";
}
- break;
+
+ 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());
+ }
+ }
+ }
+
+ /* 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());
}
}
@@ -100,6 +147,9 @@ class servgeneric extends plugin
$smarty->assign($attr."ACL", chkacl($this->acl, $attr));
$smarty->assign("$attr", $this->$attr);
}
+ $smarty->assign("baseACL", chkacl($this->acl, "base"));
+
+ $smarty->assign("staticAddress", "");
$smarty->assign("base_select", $this->base);
/* Assign status */
@@ -108,23 +158,34 @@ class servgeneric extends plugin
/* 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 {
- $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")));
}
-
/* Show main page */
- $smarty->assign("netconfig", dirname(__FILE__)."/network.tpl");
+ $smarty->assign("netconfig", $this->netConfigDNS->execute());
+ $smarty->assign("modes", $this->modes);
return($smarty->fetch (get_template_path('server.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 server failed"));
/* Delete references to object groups */
$ldap->cd ($this->config->current['BASE']);
@@ -134,8 +195,7 @@ class servgeneric extends plugin
unset($og->member[$this->dn]);
$og->save ();
}
-
- $this->handle_post_events("remove");
+ $this->handle_post_events("remove", array("macAddress" => $this->netConfigDNS->macAddress));
}
@@ -143,7 +203,7 @@ class servgeneric extends plugin
function save_object()
{
plugin::save_object();
-
+ $this->netConfigDNS->save_object();
/* Save base, since this is no LDAP attribute */
if (isset($_POST['base']) && chkacl($this->acl, "create") == ""){
$this->base= $_POST['base'];
@@ -154,12 +214,14 @@ class servgeneric extends plugin
/* 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());
$this->dn= "cn=".$this->cn.",ou=servers,ou=systems,".$this->base;
/* must: cn */
if ($this->cn == "" && chkacl ($this->acl, "cn") == ""){
- $message[]= "The required field 'Server name' is not set.";
+ $message[]= _("The required field 'Server name' is not set.");
}
$ui= get_userinfo();
@@ -176,8 +238,10 @@ class servgeneric extends plugin
if ($ldap->count() != 0){
while ($attrs= $ldap->fetch()){
if ($attrs['dn'] != $this->orig_dn){
+ if(!preg_match("/,ou=incoming,/",$attrs['dn'])){
$message[]= sprintf (_("There is already an entry '%s' in the base choosen by you"), $this->cn);
break;
+ }
}
}
}
@@ -213,18 +277,34 @@ class servgeneric extends plugin
$ldap->add($this->attrs);
$mode= "add";
} else {
- if ($this->orig_dn != $this->dn){
- $this->move($this->orig_dn, $this->dn);
+
+ /* cn is not case sensitive for ldap, but for php it is!! */
+ if($this->config->current['DNMODE'] == "cn"){
+ if (strtolower($this->orig_dn) != (strtolower($this->dn))){
+ $this->move($this->orig_dn, $this->dn);
+ plugin::save();
+ }
+ }else{
+ if ($this->orig_dn != $this->dn){
+ $this->move($this->orig_dn, $this->dn);
+ plugin::save();
+ }
}
-
+
$ldap->cd($this->dn);
- $ldap->modify($this->attrs);
+ $this->cleanup();
+ $ldap->modify ($this->attrs);
+
$mode= "modify";
}
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), _("Saving server failed"));
+ $this->netConfigDNS->cn = $this->cn;
+ $this->netConfigDNS->save($this->dn);
/* Optionally execute a command after we're done */
- $this->handle_post_events($mode);
+ if(!$this->didAction){
+ $this->handle_post_events($mode);
+ }
}
}