X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_terminalGeneric.inc;h=6fbf1bd8518c0803bd27ea9cb646a0f443e7631f;hb=e646d1b091e3d40c67039125dae867faa6fdd402;hp=f95685e7ece1f1804c5ab224b1100556c7d06dc1;hpb=91002093104478981171b9a58ded2248bd296b08;p=gosa.git
diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index f95685e7e..6fbf1bd85 100644
--- a/plugins/admin/systems/class_terminalGeneric.inc
+++ b/plugins/admin/systems/class_terminalGeneric.inc
@@ -12,14 +12,14 @@ class termgeneric extends plugin
var $gotoTerminalPath= "";
var $gotoSwapServer= "";
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();
@@ -27,28 +27,39 @@ class termgeneric extends plugin
var $ghGfxAdapter= "-";
var $ghSoundAdapter= "-";
var $gotoLastUser= "-";
-
+ var $netConfigDNS;
/* Needed values and lists */
var $base= "";
var $cn= "";
var $orig_dn= "";
+ var $inheritTimeServer = true;
+
/* Plugin side filled */
var $modes= array();
/* attribute list for save action */
var $ignore_account= TRUE;
- var $attributes= array("gotoMode", "gotoTerminalPath", "macAddress",
+ var $attributes= array("gotoMode", "gotoTerminalPath",
"gotoSwapServer", "gotoSyslogServer", "gotoNtpServer",
"gotoFloppyEnable", "gotoCdromEnable", "cn", "gotoSndModule",
- "ghCpuType", "ghMemSize", "ipHostNumber", "ghUsbSupport",
+ "ghCpuType", "ghMemSize","ghUsbSupport",
"ghGfxAdapter", "ghSoundAdapter", "gotoLastUser");
var $objectclasses= array("top", "gotoTerminal", "GOhard");
+ var $mapActions = array("reboot" => "",
+ "instant_update" => "softupdate",
+ "update" => "sceduledupdate",
+ "reinstall" => "install",
+ "rescan" => "",
+ "memcheck" => "memcheck",
+ "sysinfo" => "sysinfo");
+
+
function termgeneric ($config, $dn= NULL)
{
plugin::plugin ($config, $dn);
-
+ $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses);
/* Read arrays */
foreach (array("ghNetNic", "ghIdeDev", "ghScsiDev") as $val){
if (!isset($this->attrs[$val])){
@@ -59,6 +70,30 @@ class termgeneric extends plugin
}
}
+ /* 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 */
+ $this->gotoNtpServers = $this->config->data['SERVERS']['NTP'];
+ foreach($this->gotoNtpServers as $key => $server){
+ if($server == "default"){
+ unset($this->gotoNtpServers[$key]);
+ }
+ }
+
$this->modes["disabled"]= _("disabled");
$this->modes["text"]= _("text");
$this->modes["graphic"]= _("graphic");
@@ -71,24 +106,67 @@ class termgeneric extends plugin
$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;
+ }
+
$this->orig_dn= $this->dn;
}
function execute()
{
+ /* Call parent execute */
+ plugin::execute();
+
/* Do we need to flip is_account state? */
if (isset($_POST['modify_state'])){
$this->is_account= !$this->is_account;
}
if (isset($_POST['action'])){
+
+ /* 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(), sprintf(_("Saving of system terminal/generic (FAIstate) with dn '%s' failed."),$this->dn));
+
switch($_POST['saction']){
case 'wake':
$cmd= search_config($this->config->data['TABS'], "termgeneric", "WAKECMD");
if ($cmd == ""){
print_red(_("No WAKECMD definition found in your gosa.conf"));
} else {
- exec ($cmd." ".$this->macAddress, $dummy, $retval);
+ exec ($cmd." ".$this->netConfigDNS->macAddress, $dummy, $retval);
if ($retval != 0){
print_red(sprintf(_("Execution of '%s' failed!"), $cmd));
}
@@ -121,6 +199,31 @@ class termgeneric extends plugin
}
}
+ /* 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);
+ $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());
+ }
+ }
+
/* Do we represent a valid terminal? */
if (!$this->is_account && $this->parent == NULL){
$display= "![\"\"](\"images/stop.png\")
".
@@ -128,6 +231,18 @@ class termgeneric extends plugin
return($display);
}
+ /* 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);
@@ -135,21 +250,48 @@ class termgeneric extends plugin
$smarty->assign("bases", $this->config->idepartments);
+ /* tell smarty the inherit checkbox state */
+ $smarty->assign("inheritTimeServer",$this->inheritTimeServer);
+
/* Check if terminal is online */
$query= "fping -q -r 1 -t 500 ".$this->cn;
exec ($query, $dummy, $retval);
/* Offline */
if ($retval == 0){
- $smarty->assign("actions", array("halt" => _("Switch off"), "reboot" => _("Reboot")));
+ $smarty->assign("actions", array( "halt" => _("Switch off"),
+ "reboot" => _("Reboot"),
+ "memcheck" => _("Memory test"),
+ "sysinfo" => _("System analysis")));
} else {
- $smarty->assign("actions", array("wake" => _("Wake up")));
+ $smarty->assign("actions", array("wake" => _("Wake up"),
+ "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("ntpservers", $this->config->data['SERVERS']['NTP']);
+
+ $tmp2 = array();
+ foreach($this->config->data['SERVERS']['NFS'] as $server){
+ if($server != "default"){
+ $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("ntpservers", $tmp);
/* Variables */
foreach(array("base", "gotoMode", "gotoTerminalPath", "gotoSwapServer",
@@ -158,33 +300,36 @@ class termgeneric extends plugin
$smarty->assign($val."_select", $this->$val);
$smarty->assign($val."ACL", chkacl($this->acl, $val));
}
- $smarty->assign("ipHostNumber", $this->ipHostNumber);
- $smarty->assign("macAddress", $this->macAddress);
/* Show main page */
- $smarty->assign("netconfig", dirname(__FILE__)."/network.tpl");
+ $smarty->assign("netconfig", $this->netConfigDNS->execute());
$smarty->assign("actionACL", chkacl($this->acl, 'action'));
return($smarty->fetch (get_template_path('terminal.tpl', TRUE)));
}
function remove_from_parent()
{
+
$ldap= $this->config->get_ldap_link();
- $ldap->rmdir($this->dn);
- show_ldap_error($ldap->get_error());
-
- /* Optionally execute a command after we're done */
- $this->handle_post_events("remove");
-
- /* Delete references to object groups */
- $ldap->cd ($this->config->current['BASE']);
- $ldap->search ("(&(objectClass=gosaGroupOfNames)(member=".$this->dn."))", array("cn"));
- while ($ldap->fetch()){
- $og= new ogroup($this->config, $ldap->getDN());
- unset($og->member[$this->dn]);
- $og->save ();
+ $ldap->cd($this->dn);
+ $ldap->cat($this->dn, array('dn'));
+ if($ldap->count()){
+ $this->netConfigDNS->remove_from_parent();
+ $ldap->rmDir($this->dn);
+ 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));
+
+ /* Delete references to object groups */
+ $ldap->cd ($this->config->current['BASE']);
+ $ldap->search ("(&(objectClass=gosaGroupOfNames)(member=".$this->dn."))", array("cn"));
+ while ($ldap->fetch()){
+ $og= new ogroup($this->config, $ldap->getDN());
+ unset($og->member[$this->dn]);
+ $og->save ();
+ }
}
-
}
@@ -192,7 +337,7 @@ class termgeneric 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'];
@@ -201,13 +346,23 @@ class termgeneric extends plugin
/* Save terminal path to parent since it is used by termstartup, too */
$this->parent->by_object['termstartup']->gotoTerminalPath=
$this->gotoTerminalPath;
+
+ if(isset($_POST['termgeneric_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());
/* Permissions for that base? */
$this->dn= "cn=".$this->cn."ou=terminals,ou=systems,".$this->base;
@@ -241,6 +396,11 @@ class termgeneric extends plugin
}
}
+ /* 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);
}
@@ -277,12 +437,28 @@ class termgeneric extends plugin
$this->attrs= $attrs;
}
+ /* Set ntpServers */
+ $this->attrs['gotoNtpServer'] = array();
+ if(!$this->inheritTimeServer){
+ foreach($this->gotoNtpServer as $server){
+ $this->attrs['gotoNtpServer'][] = $server;
+ }
+ }
+
+ /* Append gosaAdministrativeUnitTag to objectClass if gosaUnitTag isset */
+ 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->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 {
@@ -290,15 +466,43 @@ class termgeneric extends plugin
$this->move($this->orig_dn, $this->dn);
}
$ldap->cd($this->dn);
- $ldap->modify($this->attrs);
+ $this->cleanup();
+ $ldap->modify ($this->attrs);
+
$this->handle_post_events("modify");
}
- show_ldap_error($ldap->get_error());
+ $this->netConfigDNS->cn = $this->cn;
+ $this->netConfigDNS->save($this->dn);
+ 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: