Changeset 11320

Show
Ignore:
Timestamp:
02/08/11 01:30:52 (2 years ago)
Author:
p_lindheimer
Message:

amp_conf needs to be global, and need to re-pass args to next level subroutines

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.9/campon/functions.inc.php

    r11304 r11320  
    1818  // This generates the dialplan 
    1919  global $ext;   
    20   global $asterisk_conf; 
     20  global $amp_conf; 
    2121  switch($engine) { 
    2222    case "asterisk": 
    …… 
    4545      $ext->add($mcontext,$exten,'', new ext_set('CCSS_SETUP', 'TRUE')); 
    4646      $ext->add($mcontext,$exten,'', new ext_noop_trace('AMPUSER: ${AMPUSER} Calling ${ARG2}:${ARG1} checking if all happy')); 
    47       $ext->add($mcontext,$exten,'monitor', new ext_gosubif('$[${LEN(${DB(AMPUSER/${ARG2}/ccss/cc_monitor_policy)})}]','monitor_config,1','monitor_default,1')); 
    48       $ext->add($mcontext,$exten,'agent', new ext_gosubif('$[${LEN(${DB(AMPUSER/${AMPUSER}/ccss/cc_agent_policy)})}]','agent_config,1','agent_default,1')); 
     47      $ext->add($mcontext,$exten,'monitor', new ext_gosubif('$[${LEN(${DB(AMPUSER/${ARG2}/ccss/cc_monitor_policy)})}]','monitor_config,1(${ARG1},${ARG2}','monitor_default,1(${ARG1},${ARG2}')); 
     48      $ext->add($mcontext,$exten,'agent', new ext_gosubif('$[${LEN(${DB(AMPUSER/${AMPUSER}/ccss/cc_agent_policy)})}]','agent_config,1(${ARG1},${ARG2}','agent_default,1(${ARG1},${ARG2}')); 
    4949      $ext->add($mcontext,$exten,'', new ext_return('${GOSUB_RETVAL}')); 
    5050