Changeset 1227

Show
Ignore:
Timestamp:
03/22/06 18:42:50 (7 years ago)
Author:
qldrob
Message:

svnmerge to current

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branch/ivr-rewrite

    • Property svnmerge-integrated changed from /freepbx/trunk:1-1206,1210,1212-1216 to /freepbx/trunk:1-1206,1210,1212-1226

  • freepbx/branch/ivr-rewrite/amp_conf/astetc/extensions.conf

    r1212 r1227  
    188188; arg1 = trunk number, arg2 = number, arg3 = route password 
    189189[macro-dialout-trunk] 
    190 exten => s,1,GotoIf($["${ARG3}" = ""]?3:2)) ; arg3 is pattern password 
     190exten => s,1,GotoIf($["${ARG3}" = ""]?3:2)  ; arg3 is pattern password 
    191191exten => s,2,Authenticate(${ARG3}) 
    192192exten => s,3,Macro(user-callerid) 
    …… 
    194194exten => s,5,Macro(outbound-callerid,${ARG1}) 
    195195exten => s,6,Set(GROUP()=OUT_${ARG1}) 
    196 exten => s,7,GotoIf($[ ${GROUP_COUNT()} > ${OUTMAXCHANS_${ARG1} ]?108) 
     196exten => s,7,GotoIf($[ ${GROUP_COUNT()} > ${OUTMAXCHANS_${ARG1}} ]?108) 
    197197; if we've used up the max channels, continue at (n+101) 
    198198exten => s,8,Set(DIAL_NUMBER=${ARG2}) 

  • freepbx/branch/ivr-rewrite/amp_conf/htdocs/admin/config.php

    r1216 r1227  
    130130 
    131131 
    132    
     132// add the APPLY Changes bar as a section, so it shows in the Administrators module 
     133$amp_sections[99] = _("Apply Changes Bar"); 
     134 
    133135foreach ($amp_sections as $key=>$value) { 
    134136  // check access 
    …… 
    172174    if (is_array($active_modules)) { 
    173175      foreach ($active_modules as $modkey => $module) { 
    174         if (is_array(array_keys($module['items']))){ 
     176        if (is_array($module['items'])){ 
    175177          foreach (array_keys($module['items']) as $item){ 
    176178            if ($display == $item)  { 

  • freepbx/branch/ivr-rewrite/amp_conf/htdocs/admin/modules/core/page.did.php

    r1201 r1227  
    218218   
    219219  defaultEmptyOK = true; 
    220   if (!isInteger(theForm.extension.value)) 
    221     return warnInvalid(theForm.extension, msgInvalidDIDNumb); 
     220//  Note, DID's can contain *'s, #'s, strings, anything. VSP's are wierd like that. 
     221//  if (!isInteger(theForm.extension.value)) 
     222//    return warnInvalid(theForm.extension, msgInvalidDIDNumb); 
    222223   
    223224  if (!isInteger(theForm.cidnum.value))