Changeset 6014

Show
Ignore:
Timestamp:
07/14/08 20:19:04 (5 years ago)
Author:
p_lindheimer
Message:

#2510 few more tweaks to the code changes here

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r6011 r6014  
    720720        // and then generate the dialplan 
    721721        // 
     722        $rg_members = array(); 
    722723        if (function_exists('ringgroups_list')) { 
    723           $rg_members = array(); 
    724724          $rg_list = ringgroups_list(true); 
    725725          foreach ($rg_list as $item) { 
    …… 
    733733            } 
    734734          } 
    735           // Now we have a hash of extensions and what ringgoups they are members of 
    736           // so we need to generate the callpickup dialplan for these specific extensions 
    737           // to try the ringgoup. 
    738           foreach ($rg_members as $exten => $grps) { 
    739             $ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup($exten)); 
    740             $ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup($exten.'@from-internal')); 
    741             $ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup($exten.'@from-did-direct')); 
    742             $ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup('FMPR-'.$exten)); 
    743             $ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup('FMPR-'.$exten.'@from-internal')); 
    744             $ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup('FMPR-'.$exten.'@from-did-direct')); 
    745             foreach ($grps as $grp) { 
    746               $ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup($grp.'@from-internal')); 
    747             } 
    748             $ext->add('app-pickup', "$fc_pickup".$exten, '', new ext_hangup('')); 
     735        } 
     736        // Now we have a hash of extensions and what ringgoups they are members of 
     737        // so we need to generate the callpickup dialplan for these specific extensions 
     738        // to try the ringgoup. 
     739        foreach ($rg_members as $exten => $grps) { 
     740          $ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup($exten)); 
     741          $ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup($exten.'@from-internal')); 
     742          $ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup($exten.'@from-did-direct')); 
     743          $ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup('FMPR-'.$exten)); 
     744          $ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup('FMPR-'.$exten.'@from-internal')); 
     745          $ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup('FMPR-'.$exten.'@from-did-direct')); 
     746          foreach ($grps as $grp) { 
     747            $ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup($grp.'@from-internal')); 
    749748          } 
     749          $ext->add('app-pickup', "$fc_pickup".$exten, '', new ext_hangup('')); 
    750750        } 
    751751      }