![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index 8b252d8f0baa4e5e98ab0139476d633b5043bedf..282693b3bd809aa222fadd9c7df6dbfc15ca854b 100644 (file)
var $gotoTerminalPath= "";
var $gotoSwapServer= "";
var $gotoSyslogServer= "";
- var $gotoNtpServer= "";
+ var $gotoSyslogServers = array();
+ var $gotoNtpServer= array();
+ var $gotoNtpServers= array();
var $gotoSndModule= "";
var $gotoFloppyEnable= "";
var $gotoCdromEnable= "";
var $cn= "";
var $orig_dn= "";
+ var $inheritTimeServer = true;
+
/* Plugin side filled */
var $modes= array();
"ghGfxAdapter", "ghSoundAdapter", "gotoLastUser");
var $objectclasses= array("top", "gotoTerminal", "GOhard");
- function termgeneric ($config, $dn= NULL)
+ var $mapActions = array("reboot" => "",
+ "instant_update" => "softupdate",
+ "update" => "sceduledupdate",
+ "reinstall" => "install",
+ "rescan" => "",
+ "memcheck" => "memcheck",
+ "sysinfo" => "sysinfo");
+
+
+ function termgeneric ($config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn);
+ plugin::plugin ($config, $dn, $parent);
$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 */
+ $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");
$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();
+ /* Call parent execute */
+ plugin::execute();
/* Do we need to flip is_account state? */
if (isset($_POST['modify_state'])){
}
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());
+
switch($_POST['saction']){
case 'wake':
$cmd= search_config($this->config->data['TABS'], "termgeneric", "WAKECMD");
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);
$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);
$tmp2 = array();
foreach($this->config->data['SERVERS']['NFS'] as $server){
if($server != "default"){
- $tmp = split("\|",$server);
- $tmp3= split(":",$tmp[0]);
-
- $servername = $tmp3[0];
- $nfsname = $tmp3[1];
-
- $path ="";
- if(isset($tmp[4])){
- $path = $tmp[4];
- }
-
- $tmp2[$servername.":".$path]= $servername.":".$path;
+ $tmp2[$server]= $server;
}else{
- $tmp2[$server]=$server;
+ $tmp2[$server]="["._("inherited")."]";
}
}
- $smarty->assign("nfsservers", $tmp2);
- $smarty->assign("syslogservers", $this->config->data['SERVERS']['SYSLOG']);
- $smarty->assign("ntpservers", $this->config->data['SERVERS']['NTP']);
+ $smarty->assign("nfsservers", $tmp2);
+
+
+
+ $smarty->assign("syslogservers", $this->gotoSyslogServers);
+ $smarty->assign("ntpservers", $this->gotoNtpServers);
/* Variables */
foreach(array("base", "gotoMode", "gotoTerminalPath", "gotoSwapServer",
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->dn);
- $ldap->cat($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());
+ show_ldap_error($ldap->get_error(), _("Removing terminal 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']);
}
/* Save terminal path to parent since it is used by termstartup, too */
+ if(isset($this->parent->by_object['termstartup'])){
$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= $this->netConfigDNS->check();
+ /* Call common method to give check the hook */
+ $message= plugin::check();
+
+ if($this->cn != "default"){
+ $message= array_merge($message, $this->netConfigDNS->check());
+ }
/* Permissions for that base? */
- $this->dn= "cn=".$this->cn."ou=terminals,ou=systems,".$this->base;
+ $this->dn= "cn=".$this->cn.",ou=terminals,ou=systems,".$this->base;
$ui= get_userinfo();
$acl= get_permissions ($this->dn, $ui->subtreeACL);
if ($this->orig_dn == 'new'){
$ldap= $this->config->get_ldap_link();
- $ldap->cd ($this->base);
- $ldap->search ("(&(objectClass=gotoTerminal)(cn=".$this->cn."))", array("cn"));
+ $ldap->cd ($this->config->current['BASE']);
+
+ /* It is possible to have a 'default' terminal on every base */
+ if($this->cn == "default"){
+ $ldap->cat($this->dn);
+ }else{
+ $ldap->search ("(&(objectClass=gotoTerminal)(cn=".$this->cn."))", array("cn"));
+ }
+
+ /* Check if there are some other terminals found */
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);
}
/* Save to LDAP */
function save()
{
+
+ /* Move object if requested */
+ if( $this->orig_dn != 'new' && $this->dn != $this->orig_dn){
+ $this->move($this->orig_dn, $this->dn);
+ }
+
plugin::save();
/* Strip out 'default' values */
foreach (array("gotoTerminalPath", "gotoSwapServer", "gotoSyslogServer") as $val){
- if ($this->attrs[$val] == "default"){
+ if (!isset($this->attrs[$val]) || $this->attrs[$val] == "default"){
$this->attrs[$val]= array();
}
}
$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 {
- if ($this->orig_dn != $this->dn){
- $this->move($this->orig_dn, $this->dn);
- }
$ldap->cd($this->dn);
$this->cleanup();
-$ldap->modify ($this->attrs);
-
+ $ldap->modify ($this->attrs);
$this->handle_post_events("modify");
}
+
+ /* cn=default and macAddress=- indicates that this is a template */
+ if($this->cn == "default"){
+ $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 terminal failed"));
/* Optionally execute a command after we're done */
$this->postcreate();