diff --git a/plugins/admin/systems/class_goTerminalServer.inc b/plugins/admin/systems/class_goTerminalServer.inc
index 86e2bd8205fe09ccba9ae4861d6108bf1fd61c21..235195fefa5f91cd94a5ff7c49482f1992e5f5a9 100644 (file)
/* This plugin only writes its objectClass */
var $objectclasses = array("goTerminalServer");
- var $attributes = array("goTerminalServerStatus","goXdmcpIsEnabled", "goFontPath");
+ var $attributes = array("goXdmcpIsEnabled", "goFontPath");
var $StatusFlag = "goTerminalServerStatus";
/* This class can't be assigned twice so it conflicts with itsself */
var $DisplayName = "";
var $dn = NULL;
var $acl;
-
+ var $cn = "";
var $goTerminalServerStatus = "";
var $goXdmcpIsEnabled = false;
var $goFontPath = "";
function getListEntry()
{
+ $this->updateStatusState();
$flag = $this->StatusFlag;
$fields['Status'] = $this->$flag;
$fields['Message'] = _("Terminal service");
function remove_from_parent()
{
plugin::remove_from_parent();
+
+ /* Remove status flag, it is not a memeber of
+ this->attributes, so ensure that it is deleted too */
+ if(!empty($this->StatusFlag)){
+ $this->attrs[$this->StatusFlag] = array();
+ }
+
/* Check if this is a new entry ... add/modify */
$ldap = $this->config->get_ldap_link();
$ldap->cat($this->dn,array("objectClass"));
$ldap->cd($this->dn);
$ldap->add($this->attrs);
}
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), sprintf(_("Removing server services/terminalServer with dn '%s' failed."),$this->dn));
$this->handle_post_events("remove");
}
$ldap->cd($this->dn);
$ldap->add($this->attrs);
}
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), sprintf(_("Saving server services/terminalServer with dn '%s' failed."),$this->dn));
if($this->initially_was_account){
$this->handle_post_events("modify");
}else{
$attrs[$flag] = $value;
$this->$flag = $value;
$ldap->modify($attrs);
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), sprintf(_("Set status flag for server services/terminalServer with dn '%s' failed."),$this->dn));
$this->action_hook();
}
}
foreach ($add_attrs as $name => $value){
$command= preg_replace("/%$name/", $value, $command);
}
+
+ /* If there are still some %.. in our command, try to fill these with some other class vars */
+ if(preg_match("/%/",$command)){
+ $attrs = get_object_vars($this);
+ foreach($attrs as $name => $value){
+ if(!is_string($value)) continue;
+ $command= preg_replace("/%$name/", $value, $command);
+ }
+ }
+
if (check_command($command)){
@DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__,
$command, "Execute");
}
}
+
+ /* Get updates for status flag */
+ function updateStatusState()
+ {
+ if(empty($this->StatusFlag)) return;
+
+ $attrs = array();
+ $flag = $this->StatusFlag;
+ $ldap = $this->config->get_ldap_link();
+ $ldap->cd($this->cn);
+ $ldap->cat($this->dn,array($flag));
+ if($ldap->count()){
+ $attrs = $ldap->fetch();
+ }
+ if(isset($attrs[$flag][0])){
+ $this->$flag = $attrs[$flag][0];
+ }
+ }
+
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>