X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fgofon%2Fconference%2Fclass_phoneConferenceManagment.inc;h=ee70b9fa4b15aeceefc5180869cb059102827f0b;hb=603ec2c00fb894306234558af3df22dff11f7b85;hp=34ff88093db0c260a1a8d390c7e175c195581f8d;hpb=4d2ae6c71adc96b10e786d727bce4e4cd6c44fcf;p=gosa.git
diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc
index 34ff88093..ee70b9fa4 100644
--- a/plugins/gofon/conference/class_phoneConferenceManagment.inc
+++ b/plugins/gofon/conference/class_phoneConferenceManagment.inc
@@ -212,15 +212,21 @@ class phoneConferenceManagment extends plugin
/* Register conftab to trigger edit dialog */
$this->conftab= new conferencetabs($this->config,$this->config->data['TABS']['CONFERENCETABS'], $this->dn);
- $this->conftab->set_acl(array(":all"));
+ $this->conftab->set_acl($this->acl);
$_SESSION['objectinfo']= $this->dn;
}
/* Insert new entry*/
if($s_action == "new"){
+ $this->dn= "new";
+ /* Set up the users ACL's for this 'dn' */
+ $this->acl= get_permissions ($this->dn, $this->ui->subtreeACL);
$this->dn= "new";
$this->conftab= new conferencetabs($this->config,$this->config->data['TABS']['CONFERENCETABS'], $this->dn);
+ $this->acl= get_permissions ($this->conftab->dn, $this->ui->subtreeACL);
+ $this->conftab->set_acl($this->acl);
$this->conftab->set_acl(array(':all'));
+ $_SESSION['objectinfo']= $this->dn;
}
/* Edit finished, check and save changes */
@@ -242,12 +248,14 @@ class phoneConferenceManagment extends plugin
}
$this->conftab->save ();
+ del_lock ($this->conftab->dn);;
unset ($this->conftab);
$this->conftab= NULL;
unset ($_SESSION['objectinfo']);
} else {
show_errors($message);
}
+
$this->reload();
}
@@ -281,7 +289,7 @@ class phoneConferenceManagment extends plugin
" ".
" ".
"
".
- " ".
+ " ".
"
".
_("Current base")." ".
" ".
@@ -301,7 +309,7 @@ class phoneConferenceManagment extends plugin
$divlist->SetEntriesPerPage(20);
$divlist->SetHeader(array(
array("string" => " "),
- array("string" =>_("Name / nummer")),
+ array("string" =>_("Name - Number")),
array("string" => _("Owner")),
array("string" => _("PIN")),
array("string" =>_("Actions"), "attach" => "style='text-align: right;border:none'")));
@@ -341,7 +349,7 @@ class phoneConferenceManagment extends plugin
foreach($this->conferences as $conferencekey => $conference ){
if((isset($conference['goFonPIN'][0]))&&($this->ui->dn==$conference['goFonConferenceOwner'][0])){
- $pin = $conference['goFonPIN'][0];
+ $pin = "
";
}else{
$pin = " ";
}
@@ -429,6 +437,8 @@ class phoneConferenceManagment extends plugin
function remove_from_parent()
{
+ $cfg = new conference($this->config, $this->dn);
+ $cfg->remove_from_parent();
$ldap= $this->config->get_ldap_link();
$ldap->cd ($this->dn);
$ldap->recursive_remove();