Changeset 6010

Show
Ignore:
Timestamp:
07/14/08 18:10:01 (5 years ago)
Author:
p_lindheimer
Message:

#2510 a couple more tweaks to the pickup dialplan, add hangup if call pickup not successful

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.5/core/functions.inc.php

    r6009 r6010  
    706706        $ext->addInclude('from-internal-additional', 'app-pickup'); 
    707707        $fclen = strlen($fc_pickup); 
     708        $ext_pickup = (strstr($version, 'BRI')) ? 'ext_dpickup' : 'ext_pickup'; 
     709 
    708710        $ext->add('app-pickup', "_$fc_pickup.", '', new ext_NoOp('Attempt to Pickup ${EXTEN:'.$fclen.'} by ${CALLERID(num)}')); 
    709         $ext_pickup = (strstr($version, 'BRI')) ? 'ext_dpickup' : 'ext_pickup'; 
    710711        $ext->add('app-pickup', "_$fc_pickup.", '', new $ext_pickup('${EXTEN:'.$fclen.'}')); 
    711712        $ext->add('app-pickup', "_$fc_pickup.", '', new $ext_pickup('${EXTEN:'.$fclen.'}@from-internal')); 
    712713        $ext->add('app-pickup', "_$fc_pickup.", '', new $ext_pickup('${EXTEN:'.$fclen.'}@from-did-direct')); 
     714        $ext->add('app-pickup', "_$fc_pickup.", '', new ext_hangup('')); 
    713715        // In order to do call pickup in ringgroups, we will need to try the ringgoup number 
    714716        // when doing call pickup for that ringgoup so we must see who is a member of what ringgroup 
     
    738740              $ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup($grp.'@from-internal')); 
    739741            } 
     742            $ext->add('app-pickup', "$fc_pickup".$exten, '', new ext_hangup('')); 
    740743          } 
    741744        } 
    742         $ext->add('app-pickup', "$fc_pickup".$exten, '', new ext_hangup('')); 
    743745      } 
    744746