Changeset 11935

Show
Ignore:
Timestamp:
03/24/11 13:01:12 (1 year ago)
Author:
p_lindheimer
Message:

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

................

r11934 | p_lindheimer | 2011-03-24 10:59:33 -0700 (Thu, 24 Mar 2011) | 9 lines


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.7

    • Property svnmerge-integrated changed from /modules/branches/2.8:1-9044,9047,9049-9054,9056-9070,9072-9073,9075,9079-9080,9082-9085,9088-9089,9092-9093,9095-9098,9102,9105,9107-9123,9127-9128,9130-9132,9137,9149-9204,9211-9214,9216,9218-9224,9230-9232,9234,9237-9239,9248-9252,9257-9262,9267-9270,9272-9274,9277-9278,9280,9282,9288-9292,9295,9297,9300-9324,9326-9327,9329-9342,9345-9349,9353-9354,9358,9363-9376,9378-9379,9385,9387-9389,9392-9393,9395-9405,9407-9408,9410,9414-9421,9423-9424,9440,9442,9446-9449,9451-9452,9454-9458,9460-9462,9464-9469,9474-9475,9483-9484,9486,9489,9495,9500-9502,9504,9508,9607,9845,9880,9976,9998,10020-10021,10299,10338,10391,10418,10432,10456,10517,10659-10664,10691,10697,10954,11015,11510,11522,11611,11909 /modules/branches/2.6:1-8497,8589,8613,8620,8651,8672,9414-9416,9752,9773,10822 to /modules/branches/2.6:1-8497,8589,8613,8620,8651,8672,9414-9416,9752,9773,10822 /modules/branches/2.8:1-9044,9047,9049-9054,9056-9070,9072-9073,9075,9079-9080,9082-9085,9088-9089,9092-9093,9095-9098,9102,9105,9107-9123,9127-9128,9130-9132,9137,9149-9204,9211-9214,9216,9218-9224,9230-9232,9234,9237-9239,9248-9252,9257-9262,9267-9270,9272-9274,9277-9278,9280,9282,9288-9292,9295,9297,9300-9324,9326-9327,9329-9342,9345-9349,9353-9354,9358,9363-9376,9378-9379,9385,9387-9389,9392-9393,9395-9405,9407-9408,9410,9414-9421,9423-9424,9440,9442,9446-9449,9451-9452,9454-9458,9460-9462,9464-9469,9474-9475,9483-9484,9486,9489,9495,9500-9502,9504,9508,9607,9845,9880,9976,9998,10020-10021,10299,10338,10391,10418,10432,10456,10517,10659-10664,10691,10697,10954,11015,11510,11522,11611,11909,11934

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

    r9288 r11935  
    553553exten => _LC-.,n,GotoIf($["x${ALERT_INFO}"="x"]?godial) 
    554554exten => _LC-.,n,SIPAddHeader(Alert-Info: ${ALERT_INFO}) 
    555 exten => _LC-.,n(godial),dial(${DB(DEVICE/${EXTEN:3}/dial)},${RT},M(auto-confirm^${RG_IDX})${DIAL_OPTIONS}) 
     555exten => _LC-.,n(godial),dial(${DB(DEVICE/${EXTEN:3}/dial)},${RT},${DIAL_OPTIONS}M(auto-confirm^${RG_IDX})) 
    556556 
    557557;------------------------------------------------------------------------ 

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

    r8779 r11935  
    5959          } else { 
    6060            // We need the DIAL_OPTIONS variable 
    61             $sops = sql("SELECT value from globals where variable='DIAL_OPTIONS'", "getRow"); 
     61            if (!isset($sops)) { 
     62              $sops = sql("SELECT value from globals where variable='DIAL_OPTIONS'", "getRow"); 
     63            } 
    6264            $dialopts = "m(${ringing})".str_replace('r', '', $sops[0]); 
    6365          } 
    …… 
    144146          $remotealert = recordings_get_file($remotealert_id); 
    145147          $toolate = recordings_get_file($toolate_id); 
    146           $ext->add("fmgrps", "_RG-${grpnum}-.", '', new ext_macro('dial','${DB(AMPUSER/'."$grpnum/followme/grptime)},". 
    147             "M(confirm^${remotealert}^${toolate}^${grpnum})$dialopts".',${EXTEN:'.$len.'}')); 
     148          $ext->add("fmgrps", "_RG-${grpnum}-.", '', new ext_macro('dial','${DB(AMPUSER/'."$grpnum/followme/grptime)},$dialopts" . "M(confirm^${remotealert}^${toolate}^${grpnum})".',${EXTEN:'.$len.'}')); 
    148149 
    149150          // If grpconf == ENABLED call with confirmation ELSE call normal 

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

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