Changeset 5882

Show
Ignore:
Timestamp:
07/02/08 12:48:00 (6 months ago)
Author:
p_lindheimer
Message:

Merged revisions 5881 via svnmerge from
http://svn.freepbx.org/modules/branches/2.4

MANUAL CHANGES: made changes to extensions.conf where 2.3 version of these
macros is located.
................

r5881 | p_lindheimer | 2008-07-02 12:39:18 -0700 (Wed, 02 Jul 2008) | 9 lines


Merged revisions 5880 via svnmerge from
http://svn.freepbx.org/modules/branches/2.5


........

r5880 | p_lindheimer | 2008-07-02 12:33:59 -0700 (Wed, 02 Jul 2008) | 1 line


#2838 added 2 new sound files and code change to differentiate between login/logoff

........

................

Files:

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,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516,5544-5545,5548-5549,5555,5564,5570,5572-5574,5576-5578,5596,5606-5610,5612,5615-5618,5623-5624,5628,5630-5642,5644-5646,5648-5651,5653-5654,5656-5657,5660,5687-5699,5701-5702,5704-5715,5723-5727,5729-5730,5733-5741,5752-5753,5756,5830-5831,5842-5843 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,4285 /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516,5544-5545,5548-5549,5555,5564,5570,5572-5574,5576-5578,5596,5606-5610,5612,5615-5618,5623-5624,5628,5630-5642,5644-5646,5648-5651,5653-5654,5656-5657,5660,5687-5699,5701-5702,5704-5715,5723-5727,5729-5730,5733-5741,5752-5753,5756,5830-5831,5842-5843,5881

  • modules/branches/2.3/core/etc/extensions.conf

    r5742 r5882  
    736736exten => s,1,Wait(1) 
    737737exten => s,n,Macro(user-callerid,SKIPTTL) 
    738 exten => s,n(a3),Read(CALLBACKNUM,agent-user)         ; get callback number from user 
     738exten => s,n(a3),Read(CALLBACKNUM,agent-login)        ; get callback number from user 
    739739exten => s,n,GotoIf($["${CALLBACKNUM}" != ""]?a7)       ; if user just pressed # or timed out, use cidnum 
    740740exten => s,n(a5),Set(CALLBACKNUM=${AMPUSER}) 
    …… 
    758758exten => s,1,Wait(1) 
    759759exten => s,n,Macro(user-callerid,SKIPTTL) 
    760 exten => s,n(a3),Read(CALLBACKNUM,agent-user)         ; get callback number from user 
     760exten => s,n(a3),Read(CALLBACKNUM,agent-logoff)       ; get callback number from user 
    761761exten => s,n,GotoIf($["${CALLBACKNUM}" = ""]?a5:a7)     ; if user just pressed # or timed out, use cidnum 
    762762exten => s,n(a5),Set(CALLBACKNUM=${AMPUSER})