Changeset 395 for trunk/admin

Timestamp:

08/14/08 11:44:42 (16 years ago)

Author:

niltonneto

Message:

Alterações necessárias devido à mudança de implementação do método
memberships() da API, que traz somente o ID dos grupos agora.

Location:

trunk/admin

Files:

• inc/class.bovoip.inc.php (modified) (1 diff)
• inc/class.sovoip.inc.php (modified) (2 diffs)
• inc/class.uivoip.inc.php (modified) (2 diffs)
• js/voip/functions.js (modified) (2 diffs)

trunk/admin/inc/class.bovoip.inc.php

@@ -36 +36 @@
                 $groups = $this->so->getGroupsLdap($pOrg);
                 
-                $group = "<ldap_ou>";
+                $group = "<groups>";
         
                 if((trim($groups) != '') && (is_array($groups)))
                 {
                         foreach($groups as $tmp)        
-                                $group .= "<ou>" . $tmp . "</ou>";
+                                $group .= "<group>" . $tmp['cn'].";".$tmp['gid'] . "</group>";                          
                 }
 
-                $group .= "</ldap_ou>";
+                $group .= "</groups>";
                 
                 return $group;

trunk/admin/inc/class.sovoip.inc.php

@@ -73 +73 @@
                 {
                         $filter = "(&(phpgwAccountType=g)(objectClass=posixGroup))";
-                        $justthese = array("cn");
+                        $justthese = array("cn","gidNumber");
                         $search = ldap_list($this->ldap, $organization, $filter, $justthese);
                         $entry = ldap_get_entries( $this->ldap, $search );
 
                         if( $entry )
-                        {
-                                foreach($entry as $tmp)
-                                        if( $tmp['cn'][0] != "" )
-                                                $result_groups[] = $tmp['cn'][0];
+                        {                                       
+                                $idx = 0;
+                                foreach($entry as $tmp) {
+                                        if( $tmp['gidnumber'][0] != "" ){
+                                                $result_groups[$idx]['gid'] = $tmp['gidnumber'][0];
+                                                $result_groups[$idx++]['cn'] = $tmp['cn'][0];                                           
+                                        }
+                                }
                         }
                         
@@ -93 +97 @@
         {
                 $this->db = $GLOBALS['phpgw']->db;
-                
                 if( $this->db )
                 {

trunk/admin/inc/class.uivoip.inc.php

@@ -75 +75 @@
                         natcasesort($gvoip);
                         
-                        foreach( $gvoip as $tmp )
-                                $gvoip .= "<option value='".$tmp."'>".$tmp."</option>";
+                        foreach( $gvoip as $tmp ){
+                                $option = explode(";",$tmp);
+                                $gvoip .= "<option value='".$tmp."'>".$option[0]."</option>";
+                        }
                 }
 
@@ -134 +136 @@
                                 foreach($_POST['voip_groups'] as $tmp)
                                         $conf['voip_groups'] = (count($conf['voip_groups']) > 0 ) ? $conf['voip_groups'] . "," . $tmp : $tmp;
-                        
+                        else{
+                                $conf['voip_groups'] = '';
+                        }
                         $this->bo->setConfDB($conf);
                 }

trunk/admin/js/voip/functions.js

@@ -17 +17 @@
                                                 flag = true;
                                 }
-                                if ( !flag )
-                                        select_voip.options[select_voip.length] = new Option(select_ldap.options[i].value, select_ldap.options[i].value, false, true);
+                                if ( !flag ) {                                  
+                                        var option = select_ldap.options[i].value.split(";");
+                                        select_voip.options[select_voip.length] = new Option(option[0], select_ldap.options[i].value, false, true);
+                                }
                         }
         }
@@ -47 +49 @@
                                 while(data)
                                 {
-                                        select_ldap.options[select_ldap.options.length] = new Option(data.firstChild.nodeValue, data.firstChild.nodeValue, false, false); 
+                                        var option = data.firstChild.nodeValue.split(";");
+                                        select_ldap.options[select_ldap.options.length] = new Option(option[0],data.firstChild.nodeValue, false, false); 
                                         data = data.nextSibling;
                                 }