Changeset 395
- Timestamp:
- 08/14/08 11:44:42 (16 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
-
admin/inc/class.bovoip.inc.php (modified) (1 diff)
-
admin/inc/class.sovoip.inc.php (modified) (2 diffs)
-
admin/inc/class.uivoip.inc.php (modified) (2 diffs)
-
admin/js/voip/functions.js (modified) (2 diffs)
-
contactcenter/index.php (modified) (1 diff)
-
expressoMail1_2/index.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/inc/class.bovoip.inc.php
r357 r395 36 36 $groups = $this->so->getGroupsLdap($pOrg); 37 37 38 $group = "< ldap_ou>";38 $group = "<groups>"; 39 39 40 40 if((trim($groups) != '') && (is_array($groups))) 41 41 { 42 42 foreach($groups as $tmp) 43 $group .= "< ou>" . $tmp . "</ou>";43 $group .= "<group>" . $tmp['cn'].";".$tmp['gid'] . "</group>"; 44 44 } 45 45 46 $group .= "</ ldap_ou>";46 $group .= "</groups>"; 47 47 48 48 return $group; -
trunk/admin/inc/class.sovoip.inc.php
r357 r395 73 73 { 74 74 $filter = "(&(phpgwAccountType=g)(objectClass=posixGroup))"; 75 $justthese = array("cn" );75 $justthese = array("cn","gidNumber"); 76 76 $search = ldap_list($this->ldap, $organization, $filter, $justthese); 77 77 $entry = ldap_get_entries( $this->ldap, $search ); 78 78 79 79 if( $entry ) 80 { 81 foreach($entry as $tmp) 82 if( $tmp['cn'][0] != "" ) 83 $result_groups[] = $tmp['cn'][0]; 80 { 81 $idx = 0; 82 foreach($entry as $tmp) { 83 if( $tmp['gidnumber'][0] != "" ){ 84 $result_groups[$idx]['gid'] = $tmp['gidnumber'][0]; 85 $result_groups[$idx++]['cn'] = $tmp['cn'][0]; 86 } 87 } 84 88 } 85 89 … … 93 97 { 94 98 $this->db = $GLOBALS['phpgw']->db; 95 96 99 if( $this->db ) 97 100 { -
trunk/admin/inc/class.uivoip.inc.php
r359 r395 75 75 natcasesort($gvoip); 76 76 77 foreach( $gvoip as $tmp ) 78 $gvoip .= "<option value='".$tmp."'>".$tmp."</option>"; 77 foreach( $gvoip as $tmp ){ 78 $option = explode(";",$tmp); 79 $gvoip .= "<option value='".$tmp."'>".$option[0]."</option>"; 80 } 79 81 } 80 82 … … 134 136 foreach($_POST['voip_groups'] as $tmp) 135 137 $conf['voip_groups'] = (count($conf['voip_groups']) > 0 ) ? $conf['voip_groups'] . "," . $tmp : $tmp; 136 138 else{ 139 $conf['voip_groups'] = ''; 140 } 137 141 $this->bo->setConfDB($conf); 138 142 } -
trunk/admin/js/voip/functions.js
r357 r395 17 17 flag = true; 18 18 } 19 if ( !flag ) 20 select_voip.options[select_voip.length] = new Option(select_ldap.options[i].value, select_ldap.options[i].value, false, true); 19 if ( !flag ) { 20 var option = select_ldap.options[i].value.split(";"); 21 select_voip.options[select_voip.length] = new Option(option[0], select_ldap.options[i].value, false, true); 22 } 21 23 } 22 24 } … … 47 49 while(data) 48 50 { 49 select_ldap.options[select_ldap.options.length] = new Option(data.firstChild.nodeValue, data.firstChild.nodeValue, false, false); 51 var option = data.firstChild.nodeValue.split(";"); 52 select_ldap.options[select_ldap.options.length] = new Option(option[0],data.firstChild.nodeValue, false, false); 50 53 data = data.nextSibling; 51 54 } -
trunk/contactcenter/index.php
r358 r395 26 26 //Enable/Disable VoIP Service -> Voip Server Config 27 27 $_SESSION['phpgw_info']['user']['preferences']['contactcenter']['voip_enabled'] = false; 28 $voip_groups = array(); 28 29 if($GLOBALS['phpgw_info']['server']['voip_groups']) { 29 $voip_groups = explode(",",$GLOBALS['phpgw_info']['server']['voip_groups']); 30 foreach($GLOBALS['phpgw']->accounts->membership() as $idx => $group){ 31 if(array_search($group['account_name'],$voip_groups) !== FALSE){ 30 foreach(explode(",",$GLOBALS['phpgw_info']['server']['voip_groups']) as $i => $voip_group){ 31 $a_voip = explode(";",$voip_group); 32 $voip_groups[] = $a_voip[1]; 33 } 34 foreach($GLOBALS['phpgw']->accounts->membership() as $idx => $group){ 35 if(array_search($group['account_name'],$voip_groups) !== FALSE){ 32 36 $_SESSION['phpgw_info']['user']['preferences']['contactcenter']['voip_enabled'] = true; 33 37 break; -
trunk/expressoMail1_2/index.php
r381 r395 40 40 41 41 //Enable/Disable VoIP Service -> Voip Server Config 42 $voip_enabled = false; 42 $voip_enabled = false; 43 $voip_groups = array(); 43 44 if($GLOBALS['phpgw_info']['server']['voip_groups']) { 44 $voip_groups = explode(",",$GLOBALS['phpgw_info']['server']['voip_groups']); 45 foreach($GLOBALS['phpgw']->accounts->membership() as $idx => $group){ 46 if(array_search($group['account_name'],$voip_groups) !== FALSE){ 45 foreach(explode(",",$GLOBALS['phpgw_info']['server']['voip_groups']) as $i => $voip_group){ 46 $a_voip = explode(";",$voip_group); 47 $voip_groups[] = $a_voip[1]; 48 } 49 foreach($GLOBALS['phpgw']->accounts->membership() as $idx => $group){ 50 if(array_search($group['account_name'],$voip_groups) !== FALSE){ 47 51 $voip_enabled = true; 48 52 break; … … 71 75 'mainscreen_showmail' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['mainscreen_showmail'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['mainscreen_showmail'] : "0", 72 76 'signature' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['signature'], 77 'type_signature' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['type_signature'], 73 78 'use_signature' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature'] : "0", 74 79 'hide_folders' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['hide_folders'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['hide_folders'] : "0",
Note: See TracChangeset
for help on using the changeset viewer.
