Changeset 10269 for modules

Show
Ignore:
Timestamp:
09/14/10 19:59:40 (3 years ago)
Author:
p_lindheimer
Message:

closes #4484 so that sercid subroutines function properly when follow-me/ringgroups are called from a queue

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.8/findmefollow/functions.inc.php

    r9980 r10269  
    202202            forcedid  - set to the DID that the call came in on or leave alone, not treated as foreign 
    203203           
    204           BLKVM_BASE - has the exten num called, hoaky if that goes away but for now use it 
     204          EXTTOCALL  - has the exten num called, hoaky if that goes away but for now use it 
    205205        */ 
    206206        if (count($ringlist)) { 
    207207          $contextname = 'sub-fmsetcid'; 
    208208          $exten = 's'; 
    209           $ext->add($contextname, $exten, '', new ext_goto('1','s-${DB(AMPUSER/${BLKVM_BASE}/followme/changecid)}')); 
     209          $ext->add($contextname, $exten, '', new ext_goto('1','s-${DB(AMPUSER/${EXTTOCALL}/followme/changecid)}')); 
    210210 
    211211          $exten = 's-fixed'; 
    212           $ext->add($contextname, $exten, '', new ext_execif('$["${REGEX("^[\+]?[0-9]+$" ${DB(AMPUSER/${BLKVM_BASE}/followme/fixedcid)})}" = "1"]', 'Set', '__TRUNKCIDOVERRIDE=${DB(AMPUSER/${BLKVM_BASE}/followme/fixedcid)}')); 
     212          $ext->add($contextname, $exten, '', new ext_execif('$["${REGEX("^[\+]?[0-9]+$" ${DB(AMPUSER/${EXTTOCALL}/followme/fixedcid)})}" = "1"]', 'Set', '__TRUNKCIDOVERRIDE=${DB(AMPUSER/${EXTTOCALL}/followme/fixedcid)}')); 
    213213          $ext->add($contextname, $exten, '', new ext_return('')); 
    214214 
    215215          $exten = 's-extern'; 
    216           $ext->add($contextname, $exten, '', new ext_execif('$["${REGEX("^[\+]?[0-9]+$" ${DB(AMPUSER/${BLKVM_BASE}/followme/fixedcid)})}" == "1" & "${FROM_DID}" != ""]', 'Set', '__TRUNKCIDOVERRIDE=${DB(AMPUSER/${BLKVM_BASE}/followme/fixedcid)}')); 
     216          $ext->add($contextname, $exten, '', new ext_execif('$["${REGEX("^[\+]?[0-9]+$" ${DB(AMPUSER/${EXTTOCALL}/followme/fixedcid)})}" == "1" & "${FROM_DID}" != ""]', 'Set', '__TRUNKCIDOVERRIDE=${DB(AMPUSER/${EXTTOCALL}/followme/fixedcid)}')); 
    217217          $ext->add($contextname, $exten, '', new ext_return('')); 
    218218 
    …… 
    226226 
    227227          $exten = '_s-.'; 
    228           $ext->add($contextname, $exten, '', new ext_noop('Unknown value for AMPUSER/${BLKVM_BASE}/followme/changecid of ${DB(AMPUSER/${BLKVM_BASE}/followme/changecid)} set to "default"')); 
    229           $ext->add($contextname, $exten, '', new ext_setvar('DB(AMPUSER/${BLKVM_BASE}/followme/changecid)', 'default')); 
     228          $ext->add($contextname, $exten, '', new ext_noop('Unknown value for AMPUSER/${EXTTOCALL}/followme/changecid of ${DB(AMPUSER/${EXTTOCALL}/followme/changecid)} set to "default"')); 
     229          $ext->add($contextname, $exten, '', new ext_setvar('DB(AMPUSER/${EXTTOCALL}/followme/changecid)', 'default')); 
    230230          $ext->add($contextname, $exten, '', new ext_return('')); 
    231231        } 

  • modules/branches/2.8/ringgroups/functions.inc.php

    r9209 r10269  
    209209            forcedid  - set to the DID that the call came in on or leave alone, not treated as foreign 
    210210           
    211           BLKVM_BASE - has the exten num called, hoaky if that goes away but for now use it 
     211          NODEST      - has the exten num called, hoaky if that goes away but for now use it 
    212212        */ 
    213213        if (count($ringlist)) { 
    214214          $contextname = 'sub-rgsetcid'; 
    215215          $exten = 's'; 
    216           $ext->add($contextname, $exten, '', new ext_goto('1','s-${DB(RINGGROUP/${BLKVM_BASE}/changecid)}')); 
     216          $ext->add($contextname, $exten, '', new ext_goto('1','s-${DB(RINGGROUP/${NODEST}/changecid)}')); 
    217217 
    218218          $exten = 's-fixed'; 
    219           $ext->add($contextname, $exten, '', new ext_execif('$["${REGEX("^[\+]?[0-9]+$" ${DB(RINGGROUP/${BLKVM_BASE}/fixedcid)})}" = "1"]', 'Set', '__TRUNKCIDOVERRIDE=${DB(RINGGROUP/${BLKVM_BASE}/fixedcid)}')); 
     219          $ext->add($contextname, $exten, '', new ext_execif('$["${REGEX("^[\+]?[0-9]+$" ${DB(RINGGROUP/${NODEST}/fixedcid)})}" = "1"]', 'Set', '__TRUNKCIDOVERRIDE=${DB(RINGGROUP/${NODEST}/fixedcid)}')); 
    220220          $ext->add($contextname, $exten, '', new ext_return('')); 
    221221 
    222222          $exten = 's-extern'; 
    223           $ext->add($contextname, $exten, '', new ext_execif('$["${REGEX("^[\+]?[0-9]+$" ${DB(RINGGROUP/${BLKVM_BASE}/fixedcid)})}" == "1" & "${FROM_DID}" != ""]', 'Set', '__TRUNKCIDOVERRIDE=${DB(RINGGROUP/${BLKVM_BASE}/fixedcid)}')); 
     223          $ext->add($contextname, $exten, '', new ext_execif('$["${REGEX("^[\+]?[0-9]+$" ${DB(RINGGROUP/${NODEST}/fixedcid)})}" == "1" & "${FROM_DID}" != ""]', 'Set', '__TRUNKCIDOVERRIDE=${DB(RINGGROUP/${NODEST}/fixedcid)}')); 
    224224          $ext->add($contextname, $exten, '', new ext_return('')); 
    225225 
    …… 
    233233 
    234234          $exten = '_s-.'; 
    235           $ext->add($contextname, $exten, '', new ext_noop('Unknown value for RINGGROUP/${BLKVM_BASE}/changecid of ${DB(RINGGROUP/${BLKVM_BASE}/changecid)} set to "default"')); 
    236           $ext->add($contextname, $exten, '', new ext_setvar('DB(RINGGROUP/${BLKVM_BASE}/changecid)', 'default')); 
     235          $ext->add($contextname, $exten, '', new ext_noop('Unknown value for RINGGROUP/${NODEST}/changecid of ${DB(RINGGROUP/${NODEST}/changecid)} set to "default"')); 
     236          $ext->add($contextname, $exten, '', new ext_setvar('DB(RINGGROUP/${NODEST}/changecid)', 'default')); 
    237237          $ext->add($contextname, $exten, '', new ext_return('')); 
    238238        }