Changeset 6292

Show
Ignore:
Timestamp:
08/08/08 16:50:08 (4 years ago)
Author:
p_lindheimer
Message:

Merged revisions 6291 via svnmerge from re #2999
http://svn.freepbx.org/modules/branches/2.5

........

r6291 | p_lindheimer | 2008-08-08 14:43:33 -0700 (Fri, 08 Aug 2008) | 1 line


fixes #2999 put s option with nomessage voicemail, it may be in the options already but is not hurt by being there twice and in case the VM_OPTS variable has something added to it in the future leaving it in there is probably better

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.4

    • Property svnmerge-integrated changed from /modules/branches/2.3:1-5233,5245,5333,5336 /modules/branches/2.5:1-5852,5880,5930,5995,6016-6017,6030-6031,6142,6218 to /modules/branches/2.3:1-5233,5245,5333,5336 /modules/branches/2.5:1-5852,5880,5930,5995,6016-6017,6030-6031,6142,6218,6291

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

    r6219 r6292  
    418418exten => s-NOMESSAGE,1,NoOp(NOMESSAGE (beeb only) voicemail) 
    419419exten => s-NOMESSAGE,n,Macro(get-vmcontext,${ARG1}) 
    420 exten => s-NOMESSAGE,n,Voicemail(${ARG1}@${VMCONTEXT},${VM_OPTS}${VMGAIN})   ; Voicemail Busy message 
     420exten => s-NOMESSAGE,n,Voicemail(${ARG1}@${VMCONTEXT},s${VM_OPTS}${VMGAIN}) 
    421421exten => s-NOMESSAGE,n,Goto(exit-${VMSTATUS},1) 
    422422 

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

    r5279 r6292  
    8282            $ext->add($contextname, $grpnum, '', new ext_setvar('CALLERID(name)','${RGPREFIX}${CALLERID(name)}')); 
    8383          } 
     84          // recording stuff 
     85          $ext->add($contextname, $grpnum, '', new ext_setvar('RecordMethod','Group')); 
     86          $ext->add($contextname, $grpnum, '', new ext_macro('record-enable','${DB(AMPUSER/'."$grpnum/followme/grplist)}".',${RecordMethod}')); 
    8487 
    8588          // MODIFIED (PL) 
    …… 
    99102          } 
    100103 
    101           // recording stuff 
    102           $ext->add($contextname, $grpnum, 'skipsimple', new ext_setvar('RecordMethod','Group')); 
    103           $ext->add($contextname, $grpnum, '', new ext_macro('record-enable','${DB(AMPUSER/'."$grpnum/followme/grplist)}".',${RecordMethod}')); 
    104  
    105104          // group dial 
    106           $ext->add($contextname, $grpnum, '', new ext_setvar('RingGroupMethod',$strategy)); 
     105          $ext->add($contextname, $grpnum, 'skipsimple', new ext_setvar('RingGroupMethod',$strategy)); 
    107106          $ext->add($contextname, $grpnum, '', new ext_setvar('_FMGRP',$grpnum)); 
    108107          if ((isset($annmsg) ? $annmsg : '') != '') {