Changeset 4089

Show
Ignore:
Timestamp:
06/20/07 18:00:11 (6 years ago)
Author:
p_lindheimer
Message:

fixed case where chained use of CID prefix was resulting in valid portions of CID being chopped off

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r3866 r4089  
    7979          // deal with group CID prefix 
    8080          $ext->add($contextname, $grpnum, '', new ext_gotoif('$["foo${RGPREFIX}" = "foo"]', 'REPCID')); 
     81          $ext->add($contextname, $grpnum, '', new ext_gotoif('$["${RGPREFIX}" != "${CALLERID(name):0:${LEN(${RGPREFIX})}}"]', 'REPCID')); 
    8182          $ext->add($contextname, $grpnum, '', new ext_noop('Current RGPREFIX is ${RGPREFIX}....stripping from Caller ID')); 
    8283          $ext->add($contextname, $grpnum, '', new ext_setvar('CALLERID(name)', '${CALLERID(name):${LEN(${RGPREFIX})}}')); 
    83           $ext->add($contextname, $grpnum, '', new ext_setvar('RGPREFIX', '')); 
     84          $ext->add($contextname, $grpnum, '', new ext_setvar('_RGPREFIX', '')); 
    8485          $ext->add($contextname, $grpnum, 'REPCID', new ext_noop('CALLERID(name) is ${CALLERID(name)}')); 
    8586          if ($grppre != '') { 
    86             $ext->add($contextname, $grpnum, '', new ext_setvar('RGPREFIX', $grppre)); 
     87            $ext->add($contextname, $grpnum, '', new ext_setvar('_RGPREFIX', $grppre)); 
    8788            $ext->add($contextname, $grpnum, '', new ext_setvar('CALLERID(name)','${RGPREFIX}${CALLERID(name)}')); 
    8889          } 

  • modules/branches/2.2/findmefollow/module.xml

    r3868 r4089  
    22  <rawname>findmefollow</rawname> 
    33  <name>Follow Me</name> 
    4   <version>2.4.9.1</version> 
     4  <version>2.4.10</version> 
    55  <changelog> 
     6    *2.4.10* Fixed bug where nested CID prefixes ends up removing part of the valid CID info 
    67    *2.4.9.1* Fixed ALERT_INFO bug, if previously set it should not set - it was clearing it 
    78    *2.4.9* Add he_IL translation 

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

    r3401 r4089  
    8080          // deal with group CID prefix 
    8181          $ext->add($contextname, $grpnum, '', new ext_gotoif('$["foo${RGPREFIX}" = "foo"]', 'REPCID')); 
     82          $ext->add($contextname, $grpnum, '', new ext_gotoif('$["${RGPREFIX}" != "${CALLERID(name):0:${LEN(${RGPREFIX})}}"]', 'REPCID')); 
    8283          $ext->add($contextname, $grpnum, '', new ext_noop('Current RGPREFIX is ${RGPREFIX}....stripping from Caller ID')); 
    8384          $ext->add($contextname, $grpnum, '', new ext_setvar('CALLERID(name)', '${CALLERID(name):${LEN(${RGPREFIX})}}')); 
    84           $ext->add($contextname, $grpnum, '', new ext_setvar('RGPREFIX', '')); 
     85          $ext->add($contextname, $grpnum, '', new ext_setvar('_RGPREFIX', '')); 
    8586          $ext->add($contextname, $grpnum, 'REPCID', new ext_noop('CALLERID(name) is ${CALLERID(name)}')); 
    8687          if ($grppre != '') { 
    87             $ext->add($contextname, $grpnum, '', new ext_setvar('RGPREFIX', $grppre)); 
     88            $ext->add($contextname, $grpnum, '', new ext_setvar('_RGPREFIX', $grppre)); 
    8889            $ext->add($contextname, $grpnum, '', new ext_setvar('CALLERID(name)','${RGPREFIX}${CALLERID(name)}')); 
    8990          } 

  • modules/branches/2.2/ringgroups/module.xml

    r4061 r4089  
    22  <rawname>ringgroups</rawname> 
    33  <name>Ring Groups</name> 
    4   <version>2.2.13</version> 
     4  <version>2.2.14</version> 
    55  <type>setup</type> 
    66  <category>Inbound Call Control</category> 
    …… 
    99  </description> 
    1010  <changelog> 
     11    *2.2.14* Fixed bug where nested CID prefixes ends up removing part of the valid CID info 
    1112    *2.2.13* Add he_IL translation 
    1213    *2.2.12* never allow group to include itself as nnn# and create infinite loop