From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 17 Oct 2008 13:15:50 +0000 (+0000)
Subject: Updated conferences
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=62fea10d88b185f9f2c3a097cf41400ed6fc570f;p=gosa.git

Updated conferences
-Added missing language ACL


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12730 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceGeneric.inc b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceGeneric.inc
index afd83c515..471dfef11 100644
--- a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceGeneric.inc
+++ b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceGeneric.inc
@@ -283,7 +283,7 @@ class conference extends plugin
     if(isset($_POST['phoneConferenceGeneric'])){
 
       /* Get selected language */
-      if(isset($_POST['language']) && isset($this->languages[get_post('language')])){
+      if($this->acl_is_writeable("language") && isset($_POST['language']) && isset($this->languages[get_post('language')])){
         $this->language = get_post('language');
       }
 
@@ -777,6 +777,8 @@ class conference extends plugin
             "description"                   => _("Description"),
             "goFonPIN"                      => _("Conference PIN"),
 
+            "language"                      => _("Language"),
+  
             "goFonHomeServer"              => _("Home server"),
             "goFonConferenceOptionP"       => _("Preset PIN"),
             "goFonConferenceOptionr"       => _("Record conference"),
diff --git a/gosa-plugins/gofon/gofon/conference/generic.tpl b/gosa-plugins/gofon/gofon/conference/generic.tpl
index d4b5468d0..901e5c080 100644
--- a/gosa-plugins/gofon/gofon/conference/generic.tpl
+++ b/gosa-plugins/gofon/gofon/conference/generic.tpl
@@ -78,9 +78,11 @@
           <td>{t}Language{/t}
           </td>
           <td>
+{render acl=$languageACL}
             <select name="language" title="{t}Select language{/t}">
               {html_options options=$languages selected=$language}
             </select>
+{/render}
           </td>
         </tr>
       </table>