diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index 5d2b4395e282f44d89e300ea4ec3da989cba4385..5c825dcaead8423c96fba623721c7baf0c7f3af0 100644 (file)
var $modes= array();
/* attribute list for save action */
+ var $ignore_account= TRUE;
var $attributes= array("gotoMode", "gotoTerminalPath", "macAddress",
"gotoSwapServer", "gotoSyslogServer", "gotoNtpServer",
"gotoFloppyEnable", "gotoCdromEnable", "cn", "gotoSndModule",
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'])){
switch($_POST['saction']){
case 'wake':
- $cmd= $this->search($this->config->data['TABS'], "termgeneric", "WAKECMD");
+ $cmd= search_config($this->config->data['TABS'], "termgeneric", "WAKECMD");
if ($cmd == ""){
print_red(_("No WAKECMD definition found in your gosa.conf"));
} else {
break;
case 'reboot':
- $cmd= $this->search($this->config->data['TABS'], "termgeneric", "REBOOTCMD");
+ $cmd= search_config($this->config->data['TABS'], "termgeneric", "REBOOTCMD");
if ($cmd == ""){
print_red(_("No REBOOTCMD definition found in your gosa.conf"));
} else {
break;
case 'halt':
- $cmd= $this->search($this->config->data['TABS'], "termgeneric", "HALTCMD");
+ $cmd= search_config($this->config->data['TABS'], "termgeneric", "HALTCMD");
if ($cmd == ""){
print_red(_("No HALTCMD definition found in your gosa.conf"));
} else {
/* Do we represent a valid terminal? */
if (!$this->is_account && $this->parent == NULL){
- $display= "<img src=\"images/stop.png\" align=center> <b>".
+ $display= "<img alt=\"\" src=\"images/stop.png\" align=middle> <b>".
_("This 'dn' has no terminal features.")."</b>";
return($display);
}
/* Fill templating stuff */
$smarty= get_smarty();
$smarty->assign("cn", $this->cn);
+ $smarty->assign("staticAddress", "");
$smarty->assign("bases", $this->config->idepartments);
}
/* Arrays */
$smarty->assign("modes", $this->modes);
- $smarty->assign("nfsservers", $this->config->data['SERVERS']['NFS']);
+
+ $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;
+ }else{
+ $tmp2[$server]=$server;
+ }
+ }
+
+ $smarty->assign("nfsservers", $tmp2);
$smarty->assign("syslogservers", $this->config->data['SERVERS']['SYSLOG']);
$smarty->assign("ntpservers", $this->config->data['SERVERS']['NTP']);
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);
+ if($ldap->count()){
+
+ $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 ();
+ }
}
-
}