Udpated ogroup queues .

Only users with same home server will be included as queue member

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

diff --git a/plugins/admin/ogroups/class_phonequeue.inc b/plugins/admin/ogroups/class_phonequeue.inc
index 7861cbde1a1f99d39f43da2e69211579138e8d05..2a2b1ad9c0e5311998bf99548df4c5d7e060840f 100644 (file)
--- a/plugins/admin/ogroups/class_phonequeue.inc
+++ b/plugins/admin/ogroups/class_phonequeue.inc
@@ -530,10 +530,22 @@ class phonequeue extends plugin
       $queueuser =array();
       $i = 0;
       $parent = $this->parent->by_object['ogroup'];
+
+      
+      $ldap = $this->config->get_ldap_link();
       foreach($parent->memberList as $member => $mem_data){
-        $obj = $parent->objcache[$member];
-        if(isset($obj['objectClass'])){
-          if(in_array("goFonAccount",$obj['objectClass'])){
+        $ldap->cat($member,array("goFonHomeServer","objectClass","dn","uid"));
+        if($ldap->count()){
+
+          $obj = $ldap->fetch();
+
+          /* Calculate server and account dependencies */
+          $is_acc = in_array("goFonAccount",$obj['objectClass']);
+          $is_home= isset($obj['goFonHomeServer'][0]) && $obj['goFonHomeServer'][0] == $this->goFonHomeServer; 
+
+          /* Append user to list of queue member,
+           *  only if user has phoneAccount extension && is on same home server */
+          if($is_acc && $is_home){
             $i ++ ;
             $queueuser[$i]['queue_name']  = $this->cn; 
             $queueuser[$i]['interface']   = "SIP/".$obj['uid'][0]; 

diff --git a/plugins/admin/ogroups/phonequeue.tpl b/plugins/admin/ogroups/phonequeue.tpl
index 5f4d59c69979f7de094fdd27e7c610808dd03be0..02e671f0f912b14a73b3253e1c4b532108805b7a 100644 (file)
--- a/plugins/admin/ogroups/phonequeue.tpl
+++ b/plugins/admin/ogroups/phonequeue.tpl
@@ -1,3 +1,7 @@
+<p style='padding-left:7px;'>
+ <img class='center' src='images/lamp.png' alt='!'>&nbsp;<b>{t}Only users with the same asterisk home server will be included to this queue.{/t}</b>
+</p>
+
 <table summary="{t}Queue Settings{/t}" style="width: 100%; vertical-align: top; text-align: left;" border="0" cellpadding="4">
 <tr>
 <td valign='top'>