![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/admin/systems/class_servService.inc b/plugins/admin/systems/class_servService.inc
index cd8788a566b224f6cbe135007099350934f57104..3c6fae64c4c4db91ef6e2dddc6b1cc7be17b9330 100644 (file)
var $cli_description= "Some longer text\nfor help";
var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
-
var $goExportEntry = array();
var $goTimeSource = array();
var $goLdapBase= "";
- var $goXdmcPlsEnabled= "";
+ var $goXdmcpIsEnabled ="";
var $goFontPath= "";
var $goNTPServer="";
var $goLdapServer="";
var $goSyslogServer="";
var $goCupsServer="";
-
/* attribute list for save action */
- var $attributes = array("goExportEntry","goTimeSource","goLdapBase","goXdmcpIsEnabled","goFontPath");
+ var $ignore_account= TRUE;
+ var $attributes = array("goExportEntry","goTimeSource","goLdapBase","goXdmcpIsEnabled","goFontPath" );
var $objectclasses = array("top","goServer");
var $additionaloc = array(
"goNfsServer" => array("goExportEntry"),
"goNtpServer" => array("goTimeSource"),
"goLdapServer" => array("goLdapBase"),
- "goTerminalServer"=> array("goXdmcpIsEnabled", "goFontPath")
-// "goSyslogServer" => array(""),
-// "goCupsServer" => array("")
+ "goTerminalServer"=> array("goXdmcpIsEnabled", "goFontPath"),
+ "goSyslogServer" => array(),
+ "goCupsServer" => array()
);
{
plugin::plugin ($config, $dn);
- /* Always is account... */
-
foreach ($this->additionaloc as $oc => $dummy){
if (isset($this->attrs['objectClass']) && in_array($oc, $this->attrs['objectClass'])){
$this->objectclasses[$oc]= $oc;
/* Fill templating stuff */
$smarty= get_smarty();
+
+ $smarty->assign("staticAddress", "");
+
/*
Handling for Nfs Export Entries
*/
{
$this->attrs['goExportEntry'][]=$_POST['NewNfsExport'];
}
-
-
/* Deleting an Entry, is a bit more complicated than adding one*/
if(isset($_POST['DelNfsEnt']))
}
/* Set the entry which we want to show in the frontend */
- $this->goExportEntry = ($this->attrs['goExportEntry']);
- unset($this->goExportEntry['count']);
-
+ if(isset($this->attrs['goExportEntry']))
+ {
+ $this->goExportEntry = ($this->attrs['goExportEntry']);
+ unset($this->goExportEntry['count']);
+ }
/*
}
/* Set the entry which we want to show in the frontend */
- $this->goTimeSource = ($this->attrs['goTimeSource']);
- unset($this->goTimeSource['count']);
+ if(isset($this->attrs['goTimeSource']))
+ {
+ $this->goTimeSource = ($this->attrs['goTimeSource']);
+ unset($this->goTimeSource['count']);
+ }
foreach ($this->attributes as $attr){
$smarty->assign("$attr", $this->$attr);
$smarty->assign("$attr"."ACL", chkacl($this->acl, $attr));
+ $smarty->assign($attr."State","");
}
/* Classes... */
- foreach ($this->additionaloc as $oc => $dummy){
+foreach ($this->additionaloc as $oc => $dummy){
if (isset($this->objectclasses[$oc])){
$smarty->assign("$oc", "checked");
+ $smarty->assign("$oc"."State", "");
$smarty->assign("$oc"."ACL", chkacl($this->acl, $oc));
+
} else {
+ $smarty->assign("$oc", "");
+ $smarty->assign("$oc"."ACL", chkacl($this->acl, $oc));
$smarty->assign("$oc"."State", "disabled");
}
}
+
+ if(isset($this->attrs['goXdmcpIsEnabled'])&&($this->attrs['goXdmcpIsEnabled']=="1"))
+ $smarty->assign("goXdmcpIsEnabled","checked");
+
return($smarty->fetch (get_template_path('servservice.tpl', TRUE)));
}
/* Save data to object */
function save_object()
{
- plugin::save_object();
-
- /* Save checkbox state */
- foreach ($this->additionaloc as $oc => $dummy){
- if (isset($_POST[$oc]) && $_POST[$oc] == '1'){
- $this->objectclasses[$oc]= $oc;
- } else {
- unset($this->objectclasses[$oc]);
+ if (isset($_POST['servicetab'])){
+ plugin::save_object();
+
+ /* Save checkbox state */
+ foreach ($this->additionaloc as $oc => $dummy){
+ if (isset($_POST[$oc]) && $_POST[$oc] == '1'){
+ $this->objectclasses[$oc]= $oc;
+ } else {
+ unset($this->objectclasses[$oc]);
+ }
}
}
/* Save to LDAP */
function save()
{
+
/* Normalize lazy objectclass arrays */
$objectclasses= array();
foreach($this->objectclasses as $oc){
$objectclasses[]= $oc;
}
-
- $this->objectclasses= $objectclasses;
plugin::save();
+
+ $test = $this->objectclasses;
+ $tmp = array_flip($this->attrs['objectClass']);
+
+
+
+ foreach($this->additionaloc as $key=>$val) {
+ unset($tmp[$key]);
+ }
+
- /* Remove objectclasses */
- unset ($this->attrs['objectClass']);
- foreach($this->objectclasses as $oc){
- $this->attrs['objectClass'][]= $oc;
- }
+ $classes = (array_flip(array_merge(array_flip($test),$tmp)));
- /* Adapt sieve server if needed */
- if (in_array('goImapServer', $this->objectclasses)){
- $this->attrs['goImapSieveServer']= preg_replace('/:.*$/', '',
- preg_replace('/^{([^}]+)}$/', '\\1',
- $this->attrs['goImapConnect']));
+ unset($this->attrs['objectClass']);
+
+ foreach($classes as $class){
+ $this->attrs['objectClass'][]=$class;
}
+
/* Remove unneeded attributes */
foreach ($this->additionaloc as $oc => $attrs){
- if (!in_array($oc, $this->objectclasses)){
+ if (!in_array($oc, $this->attrs['objectClass'])){
foreach ($attrs as $attr){
$this->attrs[$attr]= array();
}
}
}
+ $this->attrs = array_reverse($this->attrs);
+ /* Check if we are able to set these attributes */
+#fixme : It Would be better to check ObjectClass rights to, but what is to do if there are insuficient rights
+ foreach($this->additionaloc as $oc => $attrs)
+ {
+ foreach($attrs as $val)
+ {
+ if(chkacl($this->acl,$val)=="")
+ {
+ unset($this->attrs[$val]);
+ unset($this->$val);
+ }
+ }
+ }
+
/* Write to LDAP */
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->dn);
$ldap->modify($this->attrs);
show_ldap_error($ldap->get_error());
-
/* Optionally execute a command after we're done */
if ($this->initially_was_account == $this->is_account){
if ($this->is_modified){
} else {
$this->handle_post_events("add");
}
-
}
}