Changeset 10645
- Timestamp:
- 12/01/10 07:07:35 (2 years ago)
- Files:
-
- modules/branches/bootstrap-2.9 (modified) (1 prop)
- modules/branches/bootstrap-2.9/conferences/functions.inc.php (modified) (2 diffs)
- modules/branches/bootstrap-2.9/conferences/module.xml (modified) (2 diffs)
- modules/branches/bootstrap-2.9/core/functions.inc.php (modified) (1 diff)
- modules/branches/bootstrap-2.9/featurecodeadmin/module.xml (modified) (2 diffs)
- modules/branches/bootstrap-2.9/featurecodeadmin/page.featurecodeadmin.php (modified) (1 diff)
- modules/branches/bootstrap-2.9/queues/agi-bin/queue_devstate.agi (modified) (1 diff)
- modules/branches/bootstrap-2.9/queues/functions.inc.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/bootstrap-2.9
- Property svnmerge-integrated changed from /modules/branches/2.9:1-10624 /modules/branches/2.8:1-10509 to /modules/branches/2.8:1-10509 /modules/branches/2.9:1-10644
modules/branches/bootstrap-2.9/conferences/functions.inc.php
r10152 r10645 8 8 return "meetme_additional.conf"; 9 9 } 10 function addMeetme($room, $pin) {11 $this->_meetmes[$room] = $pin;10 function addMeetme($room, $userpin, $adminpin='') { 11 $this->_meetmes[$room] = $userpin.($adminpin != '' ? ','.$adminpin : ''); 12 12 } 13 13 // return the output that goes in the file … … 214 214 215 215 // add meetme config 216 $conferences_conf->addMeetme($room['exten'],$room['userpin']);216 $conferences_conf->addMeetme($room['exten'],$room['userpin'],$room['adminpin']); 217 217 } 218 218 } modules/branches/bootstrap-2.9/conferences/module.xml
r9927 r10645 2 2 <rawname>conferences</rawname> 3 3 <name>Conferences</name> 4 <version>2.8.0. 1</version>4 <version>2.8.0.2</version> 5 5 <publisher>FreePBX</publisher> 6 6 <license>GPLv2+</license> … … 9 9 <description>Allow creation of conference rooms (meet-me) where multiple people can talk together.</description> 10 10 <changelog> 11 *2.8.0.2* #4660 11 12 *2.8.0.1* #4309 12 13 *2.8.0.0* #3331 max participants option modules/branches/bootstrap-2.9/core/functions.inc.php
r10637 r10645 1643 1643 1644 1644 $context = 'sub-flp-'.$tid; 1645 $target = 'TARGET_FLP 4'.$tid;1645 $target = 'TARGET_FLP_'.$tid; 1646 1646 $exten = 's'; 1647 1647 foreach ($patterns as $pattern) { modules/branches/bootstrap-2.9/featurecodeadmin/module.xml
r10608 r10645 12 12 <featurecodeadmin>Feature Codes</featurecodeadmin> 13 13 </menuitems> 14 <location>release/2.8/featurecodeadmin-2.8.0. 0.tgz</location>14 <location>release/2.8/featurecodeadmin-2.8.0.1.tgz</location> 15 15 <changelog> 16 *2.9.0.0* #46 53 Generate Feature Code Destinations16 *2.9.0.0* #4617, #4653 Generate Feature Code Destinations 17 17 *2.8.0.0* published 2.8 version 18 18 *2.7.0.0* localizations … … 37 37 <version>2.5.0alpha1</version> 38 38 </depends> 39 <md5sum> 531628f1d9f7e4d09cf4c54bbe40c545</md5sum>39 <md5sum>39a0f68a9846da446dcb81d1c75a11cb</md5sum> 40 40 </module> modules/branches/bootstrap-2.9/featurecodeadmin/page.featurecodeadmin.php
r7792 r10645 220 220 var featureid = theFld.name.substring(7); 221 221 // check that every non default has a custom code 222 if (!theForm.elements['usedefault_' + featureid].checked && theForm.elements['ena#' + featureid].value == 1) {222 if (!theForm.elements['usedefault_' + featureid].checked) { 223 223 defaultEmptyOK = false; 224 224 if (!isDialDigits(theFld.value)) modules/branches/bootstrap-2.9/queues/agi-bin/queue_devstate.agi
r10626 r10645 83 83 if (ereg('(\\d+)',$item1)) { 84 84 preg_match_all ("/(\\d+)/is", $item1,$matches); 85 if ( $matches[1][0] != '') {85 if (isset($matches[1][0]) && $matches[1][0] != '') { 86 86 $queues[]=$matches[1][0]; 87 87 $inqueue=$matches[1][0]; modules/branches/bootstrap-2.9/queues/functions.inc.php
r10637 r10645 148 148 $name = $users[$matches[1]]; 149 149 str_replace(',','\,',$name); 150 $output .= "member=$member,$name, HINT:".$matches[1]."@ext-local\n";150 $output .= "member=$member,$name,hint:".$matches[1]."@ext-local\n"; 151 151 } else { 152 152 $output .= "member=".$member."\n"; … … 564 564 565 565 if ($amp_conf['USEQUEUESTATE']) { 566 $ext->add($context, $exten, '', new ext_execif('$[${DB_EXISTS(AMPUSER/${CALLBACKNUM}/cidname)} = 1]', 'AddQueueMember', '${ARG1},Local/${CALLBACKNUM}@from-queue/n,${DB(QPENALTY/${ARG1}/agents/${CALLBACKNUM})},,${DB(AMPUSER/${CALLBACKNUM}/cidname)}, HINT:${CALLBACKNUM}@ext-local'));566 $ext->add($context, $exten, '', new ext_execif('$[${DB_EXISTS(AMPUSER/${CALLBACKNUM}/cidname)} = 1]', 'AddQueueMember', '${ARG1},Local/${CALLBACKNUM}@from-queue/n,${DB(QPENALTY/${ARG1}/agents/${CALLBACKNUM})},,${DB(AMPUSER/${CALLBACKNUM}/cidname)},hint:${CALLBACKNUM}@ext-local')); 567 567 $ext->add($context, $exten, '', new ext_execif('$[${DB_EXISTS(AMPUSER/${CALLBACKNUM}/cidname)} = 0]', 'AddQueueMember', '${ARG1},Local/${CALLBACKNUM}@from-queue/n,${DB(QPENALTY/${ARG1}/agents/${CALLBACKNUM})}')); 568 568 } else if ($ast_ge_14_25) { … … 1057 1057 $ext->add($id, $c, '', new ext_gotoif('$["${DB(QPENALTY/${QUEUENO}/dynmemberonly)}" = "yes" & ${DB_EXISTS(QPENALTY/${QUEUENO}/agents/${CALLBACKNUM})} != 1]', 'invalid')); 1058 1058 if ($amp_conf['USEQUEUESTATE']) { 1059 $ext->add($id, $c, '', new ext_addqueuemember('${QUEUENO}','Local/${CALLBACKNUM}@from-queue/n,${DB(QPENALTY/${QUEUENO}/agents/${CALLBACKNUM})},,${DB(AMPUSER/${CALLBACKNUM}/cidname)}, HINT:${CALLBACKNUM}@ext-local'));1059 $ext->add($id, $c, '', new ext_addqueuemember('${QUEUENO}','Local/${CALLBACKNUM}@from-queue/n,${DB(QPENALTY/${QUEUENO}/agents/${CALLBACKNUM})},,${DB(AMPUSER/${CALLBACKNUM}/cidname)},hint:${CALLBACKNUM}@ext-local')); 1060 1060 } else if ($ast_ge_14_25) { 1061 1061 $ext->add($id, $c, '', new ext_addqueuemember('${QUEUENO}','Local/${CALLBACKNUM}@from-queue/n,${DB(QPENALTY/${QUEUENO}/agents/${CALLBACKNUM})},,${DB(AMPUSER/${CALLBACKNUM}/cidname)},${DB(DEVICE/${REALCALLERIDNUM}/dial)}'));
