From 5ec753a58a4c55777f96737f052ced0290c784d3 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 18 Aug 2005 12:05:16 +0000 Subject: [PATCH] PIN in Conference list hidden. Can't rename conference fixed git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1181 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/gofon/conference/class_phoneConferenceGeneric.inc | 4 +++- plugins/gofon/conference/class_phoneConferenceManagment.inc | 2 +- plugins/gofon/conference/generic.tpl | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/gofon/conference/class_phoneConferenceGeneric.inc b/plugins/gofon/conference/class_phoneConferenceGeneric.inc index be02495cf..89f1d56da 100644 --- a/plugins/gofon/conference/class_phoneConferenceGeneric.inc +++ b/plugins/gofon/conference/class_phoneConferenceGeneric.inc @@ -27,6 +27,7 @@ class conference extends plugin var $ou = ""; var $goFonPIN = ""; var $acl = ""; + var $old_cn = ""; var $goFonConferenceOption = ""; var $goFonConferenceOption_P = ""; // Set PIN @@ -103,6 +104,7 @@ class conference extends plugin $this->old_tele_number = $this->telephoneNumber; } $this->old_dn = $this->dn; + $this->old_cn = $this->cn; } function execute() @@ -376,7 +378,7 @@ class conference extends plugin } $num = $this->telephoneNumber; - if((isset($numbers[$num]))&&(($numbers[$num]['cn'][0]!=$this->cn))){ + if((isset($numbers[$num]))&&(($numbers[$num]['cn'][0]!=$this->old_cn))){ if(isset($numbers[$num]['uid'][0])){ return sprintf(_("The specified telephonenumber '%s' is already assigned to '%s'."),$num,$numbers[$num]['uid'][0]); }else{ diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc index 34ff88093..71c0efc95 100644 --- a/plugins/gofon/conference/class_phoneConferenceManagment.inc +++ b/plugins/gofon/conference/class_phoneConferenceManagment.inc @@ -341,7 +341,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 = "PIN"; }else{ $pin = " "; } diff --git a/plugins/gofon/conference/generic.tpl b/plugins/gofon/conference/generic.tpl index 43bd158c2..fd5466ac1 100644 --- a/plugins/gofon/conference/generic.tpl +++ b/plugins/gofon/conference/generic.tpl @@ -104,7 +104,7 @@   - {t}PIN{/t} + {t}PIN{/t} -- 2.30.2