Changeset 9096

Show
Ignore:
Timestamp:
03/08/10 10:16:47 (2 years ago)
Author:
p_lindheimer
Message:

fixes #4100 use CUT() exclusively in parsing recordings, also unrelated puts Macro(user-callerid) back into pri 1 of all outbound routes which won't be executed but for custom code and maybe custom contexts out there using these routes it retains previous behavior while not affecting anything in the main dialplan

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.7/core/functions.inc.php

    r9065 r9096  
    14991499        $ext->add($context, $exten, 'Group', new ext_set('LOOPCNT','${FIELDQTY(ARG1,-)}')); 
    15001500        $ext->add($context, $exten, '', new ext_set('ITER','1')); 
    1501         $ext->add($context, $exten, 'begin', new ext_set('RECSET','"${DB(AMPUSER/${CUT(ARG1,-,${ITER})}/recording)}"')); 
    1502         $ext->add($context, $exten, '', new ext_gotoif('$["${RECSET}"="" | "${CUT(RECSET,\\\\\|,2):3}" != "Always"]', 'continue')); 
    1503         $ext->add($context, $exten, '', new ext_set('TEXTEN','${CUT(ARG1,-,${ITER})')); 
     1501        $ext->add($context, $exten, 'begin', new ext_gotoif('$["${CUT(DB(AMPUSER/${CUT(ARG1,-,${ITER})}/recording),=,3)}" != "Always"]', 'continue')); 
     1502        $ext->add($context, $exten, '', new ext_set('TEXTEN','${CUT(ARG1,-,${ITER})}')); 
    15041503        $ext->add($context, $exten, '', new ext_noop('Recording enable for ${TEXTEN}')); 
    15051504        $ext->add($context, $exten, '', new ext_set('CALLFILENAME','g${TEXTEN}-${STRFTIME(${EPOCH},,%Y%m%d-%H%M%S)}-${UNIQUEID}')); 
    …… 
    15391538          // 
    15401539          if ($pri_noop) { 
    1541             $ext->add($outrt['application'], $exten['extension'], '', new ext_noop('Macro(user-callerid): executed in outbound-allroutes PRI 1'));  
     1540            // This will not get called, but it fixes some things like custom-context or other possible custom uses of these 
     1541            // generated contexts that don't have an 'outbound-allroutes' wrapper around them, of course in those cases the 
     1542            // CID part of the dialplan will not get executed 
     1543            $ext->add($outrt['application'], $exten['extension'], '', new ext_macro('user-callerid,SKIPTTL'));  
    15421544            $pri_noop = false; 
    15431545          } 

  • modules/branches/2.7/core/module.xml

    r9067 r9096  
    44  <category>Basic</category> 
    55  <name>Core</name> 
    6   <version>2.7.0.2</version> 
     6  <version>2.7.0.3</version> 
    77  <publisher>FreePBX</publisher> 
    88  <license>GPLv2+</license> 
    …… 
    1010  <canuninstall>no</canuninstall> 
    1111  <changelog> 
     12    *2.7.0.3* #4100, #4102 
    1213    *2.7.0.2* really fix #4092 
    1314    *2.7.0.1* #4093, #4094, #4095, #4092