Changeset 14279

Show
Ignore:
Timestamp:
07/25/12 16:12:19 (10 months ago)
Author:
p_lindheimer
Message:

fixes #5913 I think though no feedback from reporter

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.10/paging/functions.inc.php

    r14120 r14279  
    146146        $ds = $amp_conf['ASTCONFAPP'] == 'app_confbridge' ? '${DIALSTR}-${CUT(DEVICES,&,${ITER})}'  
    147147          : '${DIALSTR}&LOCAL/PAGE${CUT(DEVICES,&,${ITER})}@'.$apppaging; 
    148         $ext->add($context, $code, 'begin', new ext_setvar('DIALSTR', $ds)); 
    149         $ext->add($context, $code, '', new ext_setvar('ITER', '$[${ITER} + 1]')); 
     148        $ext->add($context, $code, 'begin', new ext_chanisavail('${DB(DEVICE/${CUT(DEVICES,&,${ITER})}/dial)}','s')); 
     149        $ext->add($context, $code, '', new ext_gotoif('$["${AVAILORIGCHAN}" = ""]', 'skip')); 
     150        $ext->add($context, $code, '', new ext_setvar('DIALSTR', $ds)); 
     151        $ext->add($context, $code, 'skip', new ext_setvar('ITER', '$[${ITER} + 1]')); 
    150152        $ext->add($context, $code, '', new ext_gotoif('$[${ITER} <= ${LOOPCNT}]', 'begin')); 
    151153        $ext->add($context, $code, '', new ext_setvar('DIALSTR', '${DIALSTR:1}')); 
     154        $ext->add($context, $code, '', new ext_gotoif('$["${DIALSTR}" = ""]', 'end2')); 
    152155        $ext->add($context, $code, '', new ext_setvar('_AMPUSER', '${AMPUSER}')); 
    153156        if ($amp_conf['ASTCONFAPP'] == 'app_confbridge') { 
    …… 
    156159          $ext->add($context, $code, '', new ext_page('${DIALSTR},d')); 
    157160        } 
    158         $ext->add($context, $code, '', new ext_execif('$[${INTERCOM_RETURN}]', 'Return')); 
     161        $ext->add($context, $code, 'end2', new ext_execif('$[${INTERCOM_RETURN}]', 'Return')); 
    159162        $ext->add($context, $code, '', new ext_busy()); 
    160163        $ext->add($context, $code, '', new ext_macro('hangupcall'));