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

diff --git a/plugins/gofon/conference/class_phoneConferenceGeneric.inc b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
index be02495cfc958ed2f030823432865fc54ae9f988..89f1d56da665935ac79c176b036f013de8f644e5 100644 (file)
--- 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 34ff88093db0c260a1a8d390c7e175c195581f8d..71c0efc951953547378daa2db51ded22c24f403c 100644 (file)
--- 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 = "<img src='images/list_password.png' title='PIN : ".$conference['goFonPIN'][0]."' alt='PIN'>";
       }else{
         $pin = "&nbsp;";
       }

diff --git a/plugins/gofon/conference/generic.tpl b/plugins/gofon/conference/generic.tpl
index 43bd158c2d643a20c92706ae93dc6f46b6e9b001..fd5466ac1210a4bdb38e4ff30b635aaa4a05fec5 100644 (file)
--- a/plugins/gofon/conference/generic.tpl
+++ b/plugins/gofon/conference/generic.tpl
@@ -104,7 +104,7 @@
          
        </td>
        <td>
-               {t}PIN{/t} <input type='text' name="goFonPIN" {$goFonPINACL} id="goFonPIN" value="{$goFonPIN}">
+               {t}PIN{/t} <input type='password' name="goFonPIN" {$goFonPINACL} id="goFonPIN" value="{$goFonPIN}" title="{$goFonPIN}">
        </td>
        </tr>
     <tr>