Changeset 11934

Show
Ignore:
Timestamp:
03/24/11 13:59:33 (2 years ago)
Author:
p_lindheimer
Message:

Merged revisions 11933 via svnmerge from
http://www.freepbx.org/v2/svn/modules/branches/2.9

........

r11933 | p_lindheimer | 2011-03-24 10:51:11 -0700 (Thu, 24 Mar 2011) | 1 line


fixes #5011 add confirm macro to end of dialoptions so it is the one used, please test and provide feedback if this fixed it I am going to assume it does

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.8

    • Property svnmerge-integrated changed from /modules/branches/2.7:1-9074,9105,10001,10196,10253,10264,10295,10355,10399-10422,10424-10426,10428-10430,10432-10433,10436-10458,10628,10802,10816,10823,10869,10875-10876 /modules/branches/2.9:1-10122,10411-10428,10430-10440,10442-10444,10447,10449-10451,10453-10510,10512-10526,10529-10533,10536-10539,10542-10543,10545-10549,10556-10564,10572-10576,10578-10581,10597-10599,10602,10605,10607,10611,10658,10690,10771,11295,11327,11370,11496-11498,11502,11504,11506-11507,11509-11512,11515-11516,11519,11522-11535,11540,11543,11555-11556,11558-11562,11565-11570,11610,11907-11908 to /modules/branches/2.9:1-10122,10411-10428,10430-10440,10442-10444,10447,10449-10451,10453-10510,10512-10526,10529-10533,10536-10539,10542-10543,10545-10549,10556-10564,10572-10576,10578-10581,10597-10599,10602,10605,10607,10611,10658,10690,10771,11295,11327,11370,11496-11498,11502,11504,11506-11507,11509-11512,11515-11516,11519,11522-11535,11540,11543,11555-11556,11558-11562,11565-11570,11610,11907-11908,11933 /modules/branches/2.7:1-9074,9105,10001,10196,10253,10264,10295,10355,10399-10422,10424-10426,10428-10430,10432-10433,10436-10458,10628,10802,10816,10823,10869,10875-10876

  • modules/branches/2.8/core/etc/extensions.conf

    r10714 r11934  
    559559exten => _LC-.,n,GotoIf($["x${ALERT_INFO}"="x"]?godial) 
    560560exten => _LC-.,n,SIPAddHeader(Alert-Info: ${ALERT_INFO}) 
    561 exten => _LC-.,n(godial),dial(${DB(DEVICE/${EXTEN:3}/dial)},${RT},M(auto-confirm^${RG_IDX})${DIAL_OPTIONS}) 
     561exten => _LC-.,n(godial),dial(${DB(DEVICE/${EXTEN:3}/dial)},${RT},${DIAL_OPTIONS}M(auto-confirm^${RG_IDX})) 
    562562 
    563563;------------------------------------------------------------------------ 

  • modules/branches/2.8/findmefollow/functions.inc.php

    r10269 r11934  
    6161          } else { 
    6262            // We need the DIAL_OPTIONS variable 
    63             $sops = sql("SELECT value from globals where variable='DIAL_OPTIONS'", "getRow"); 
     63            if (!isset($sops)) { 
     64              $sops = sql("SELECT value from globals where variable='DIAL_OPTIONS'", "getRow"); 
     65            } 
    6466            $dialopts = "m(${ringing})".str_replace('r', '', $sops[0]); 
    6567          } 
    …… 
    149151          $remotealert = recordings_get_file($remotealert_id); 
    150152          $toolate = recordings_get_file($toolate_id); 
    151           $ext->add("fmgrps", "_RG-${grpnum}-.", '', new ext_macro('dial','${DB(AMPUSER/'."$grpnum/followme/grptime)},". 
    152             "M(confirm^${remotealert}^${toolate}^${grpnum})$dialopts".',${EXTEN:'.$len.'}')); 
     153          $ext->add("fmgrps", "_RG-${grpnum}-.", '', new ext_macro('dial','${DB(AMPUSER/'."$grpnum/followme/grptime)},$dialopts" . "M(confirm^${remotealert}^${toolate}^${grpnum})".',${EXTEN:'.$len.'}')); 
    153154 
    154155          // If grpconf == ENABLED call with confirmation ELSE call normal 

  • modules/branches/2.8/ringgroups/functions.inc.php

    r10662 r11934  
    9393          } else { 
    9494            // We need the DIAL_OPTIONS variable 
    95             $sops = sql("SELECT value from globals where variable='DIAL_OPTIONS'", "getRow"); 
     95            if (!isset($sops)) { 
     96              $sops = sql("SELECT value from globals where variable='DIAL_OPTIONS'", "getRow"); 
     97            } 
    9698            $dialopts = "m(${ringing})".str_replace('r', '', $sops[0]); 
    9799          } 
    …… 
    162164            $toolate = recordings_get_file($toolate_id); 
    163165            $len=strlen($grpnum)+4; 
    164             $ext->add("grps", "_RG-${grpnum}-.", '', new ext_macro('dial',$grptime. 
    165               ",M(confirm^${remotealert}^${toolate}^${grpnum})$dialopts".',${EXTEN:'.$len.'}')); 
     166            $ext->add("grps", "_RG-${grpnum}-.", '', new ext_macro('dial', "$grptime,$dialopts" . "M(confirm^${remotealert}^${toolate}^${grpnum})" . ',${EXTEN:' . $len . '}')); 
    166167            $ext->add($contextname, $grpnum, 'DIALGRP', new ext_macro('dial-confirm',"$grptime,$dialopts,$grplist,$grpnum")); 
    167168          } else {