Changeset 2236

Show
Ignore:
Timestamp:
08/06/06 14:17:08 (7 years ago)
Author:
p_lindheimer
Message:

add modifier relating to #1068 so that x at the end of an extension will not put alertinfo, sipheader and uri information so that cyberdata and other possible devices will work

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.1/paging/functions.inc.php

    r2235 r2236  
    7373      foreach ($results as $grouparr) { 
    7474        $xtn=trim($grouparr[0]); 
    75         $ext->add('ext-paging', "PAGE${xtn}", '', new ext_gotoif('$[ ${CALLERID(number)} = '.$xtn.' ]','skipself')); 
    76         $ext->add('ext-paging', "PAGE${xtn}", '', new ext_setvar('__SIPADDHEADER', 'Call-Info: \;answer-after=0')); 
    77         $ext->add('ext-paging', "PAGE${xtn}", '', new ext_setvar('__ALERT_INFO', 'Ring Answer')); 
    78         $ext->add('ext-paging', "PAGE${xtn}", '', new ext_setvar('__SIP_URI_OPTIONS', 'intercom=true')); 
     75        if (strtoupper(substr($xtn,-1)) == "X") { 
     76          $xtn = rtrim($xtn,"xX"); 
     77          $ext->add('ext-paging', "PAGE${xtn}", '', new ext_gotoif('$[ ${CALLERID(number)} = '.$xtn.' ]','skipself')); 
     78        } else { 
     79          $ext->add('ext-paging', "PAGE${xtn}", '', new ext_gotoif('$[ ${CALLERID(number)} = '.$xtn.' ]','skipself')); 
     80          $ext->add('ext-paging', "PAGE${xtn}", '', new ext_setvar('__SIPADDHEADER', 'Call-Info: \;answer-after=0')); 
     81          $ext->add('ext-paging', "PAGE${xtn}", '', new ext_setvar('__ALERT_INFO', 'Ring Answer')); 
     82          $ext->add('ext-paging', "PAGE${xtn}", '', new ext_setvar('__SIP_URI_OPTIONS', 'intercom=true')); 
     83        } 
    7984        $ext->add('ext-paging', "PAGE${xtn}", '', new ext_dial("SIP/${xtn}", 5)); 
    8085        $ext->add('ext-paging', "PAGE${xtn}", 'skipself', new ext_noop('Not paging originator')); 
     
    8994        $dialstr=''; 
    9095        foreach($all_exts as $local_dial) { 
     96 
     97          if (strtoupper(substr($local_dial[0],-1)) == "X") { 
     98            $local_dial[0] = rtrim($local_dial[0],"xX"); 
     99          } 
     100 
    91101          $dialstr .= "LOCAL/PAGE".trim($local_dial[0])."@ext-paging&"; 
    92102        } 
  • modules/branches/2.1/paging/module.xml

    r1906 r2236  
    22  <rawname>paging</rawname> 
    33  <name>Paging and Intercom</name> 
    4   <version>1.2.1</version> 
     4  <version>1.2.2</version> 
    55  <type>setup</type> 
    66  <category>Module</category>