Changeset 4279
- Timestamp:
- 06/30/07 14:52:21 (1 year ago)
- Files:
-
- modules/branches/2.3 (modified) (1 prop)
- modules/branches/2.3/core/etc/extensions.conf (modified) (5 diffs)
- modules/branches/2.3/core/module.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.3
- Property svnmerge-integrated changed from /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098 to /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265
modules/branches/2.3/core/etc/extensions.conf
r4181 r4279 62 62 ; Macro(dial,$DIAL_TIMER,$DIAL_OPTIONS,$EXT1,$EXT2,$EXT3,...) 63 63 [macro-dial] 64 exten => s,1, DeadAGI(dialparties.agi)64 exten => s,1,AGI(dialparties.agi) 65 65 exten => s,2,NoOp(Returned from dialparties with no extensions to call) 66 66 exten => s,3,NoOp(DIALSTATUS is '${DIALSTATUS}') … … 655 655 exten => s,n(skipoutcid),GotoIf($["${OUTMAXCHANS_${DIAL_TRUNK}}foo" = "foo"]?nomax) 656 656 exten => s,n(checkmax),GotoIf($[ ${GROUP_COUNT()} > ${OUTMAXCHANS_${DIAL_TRUNK}} ]?chanfull) 657 exten => s,n(nomax), DeadAGI(fixlocalprefix) ; this sets DIAL_NUMBER to the proper dial string for this trunk657 exten => s,n(nomax),AGI(fixlocalprefix) ; this sets DIAL_NUMBER to the proper dial string for this trunk 658 658 exten => s,n,Set(OUTNUM=${OUTPREFIX_${DIAL_TRUNK}}${DIAL_NUMBER}) ; OUTNUM is the final dial number 659 659 exten => s,n,Set(custom=${CUT(OUT_${DIAL_TRUNK},:,1)}) ; Custom trunks are prefixed with "AMP:" … … 690 690 691 691 exten => _s-.,1,GotoIf($["x${OUTFAIL_${ARG1}}" = "x"]?noreport) 692 exten => _s-.,n, DeadAGI(${OUTFAIL_${ARG1}})692 exten => _s-.,n,AGI(${OUTFAIL_${ARG1}}) 693 693 exten => _s-.,n(noreport),Noop(TRUNK Dial failed due to ${DIALSTATUS} - failing through to other trunks) 694 694 … … 741 741 exten => s,n,Set(DIAL_NUMBER=${ARG2}) 742 742 exten => s,n,Set(DIAL_TRUNK=${ARG1}) 743 exten => s,n, DeadAGI(fixlocalprefix) ; this sets DIAL_NUMBER to the proper dial string for this trunk743 exten => s,n,AGI(fixlocalprefix) ; this sets DIAL_NUMBER to the proper dial string for this trunk 744 744 ; Replacement for asterisk's ENUMLOOKUP function 745 exten => s,n, DeadAGI(enumlookup.agi)745 exten => s,n,AGI(enumlookup.agi) 746 746 ; Now we have the variable DIALARR set to a list of URI's that can be called, in order of priority 747 747 ; Loop through them trying them in order. … … 880 880 exten => s,4,Set(DEVAMPUSER=${DB(DEVICE/${CALLERID(number)}/user)}) 881 881 exten => s,5,Set(AMPUSERDEVICES=${DB(AMPUSER/${DEVAMPUSER}/device)}) 882 exten => s,6, DeadAGI(list-item-remove.php,${AMPUSERDEVICES},${CALLERID(number)},AMPUSERDEVICES,&)882 exten => s,6,AGI(list-item-remove.php,${AMPUSERDEVICES},${CALLERID(number)},AMPUSERDEVICES,&) 883 883 ; reset user -> device mapping 884 884 ; users can log onto multiple devices, need to just remove device from value modules/branches/2.3/core/module.xml
r4230 r4279 7 7 <candisable>no</candisable> 8 8 <changelog> 9 *2.3.0beta1.4* #1522 DeadAGI back to AGI, fixed Trunk Dial Rules tooltip, added wanrnings comments to agi-bin scripts 9 10 *2.3.0beta1.3* #1633 proper display after deleting, #1747 add South Africa to indications.conf, #2024 can't edit exten with directdid set 10 11 *2.3.0beta1.2* Changed CW default to on, changed freePBX to FreePBX
