Show
Ignore:
Timestamp:
10/24/07 21:18:07 (6 years ago)
Author:
p_lindheimer
Message:

Merged revisions 5159 via svnmerge from
http://svn.freepbx.org/modules/branches/2.3

........

r5159 | p_lindheimer | 2007-10-24 18:16:48 -0700 (Wed, 24 Oct 2007) | 1 line


#2376 enable/disable code broke in 1.6.6 and add user-callerid to get proper cid on intercom

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.4

    • Property svnmerge-integrated changed from /modules/branches/2.3:1-5080,5111,5128,5130,5155,5157 to /modules/branches/2.3:1-5080,5111,5128,5130,5155,5157,5159

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

    r5024 r5161  
    3030        $ext->add('ext-intercom', '_'.$code.'.', '', new ext_setvar('__ALERT_INFO', 'Ring Answer')); 
    3131        $ext->add('ext-intercom', '_'.$code.'.', '', new ext_setvar('__SIP_URI_OPTIONS', 'intercom=true')); 
     32        $ext->add('ext-intercom', '_'.$code.'.', '', new ext_macro('user-callerid')); 
    3233        $ext->add('ext-intercom', '_'.$code.'.', '', new ext_dial('Local/${dialnumber}@from-internal/n','','')); 
    3334        $ext->add('ext-intercom', '_'.$code.'.', '', new ext_busy()); 
    …… 
    5354 
    5455        if ($oncode) { 
    55           $ext->add('ext-intercom', $oncode, '', new ext_answer('')); 
    56           $ext->add('ext-intercom', $oncode, '', new ext_wait('1')); 
    57           $ext->add('ext-intercom', $oncode, '', new ext_macro('user-callerid')); 
    58           $ext->add('ext-intercom', $oncode, '', new ext_setvar('DB(AMPUSER/${AMPUSER}/intercom)', 'enabled')); 
    59           $ext->add('ext-intercom', $oncode, '', new ext_playback('intercom&enabled')); 
    60           $ext->add('ext-intercom', $oncode, '', new ext_macro('hangupcall')); 
     56          $ext->add('ext-intercom-users', $oncode, '', new ext_answer('')); 
     57          $ext->add('ext-intercom-users', $oncode, '', new ext_wait('1')); 
     58          $ext->add('ext-intercom-users', $oncode, '', new ext_macro('user-callerid')); 
     59          $ext->add('ext-intercom-users', $oncode, '', new ext_setvar('DB(AMPUSER/${AMPUSER}/intercom)', 'enabled')); 
     60          $ext->add('ext-intercom-users', $oncode, '', new ext_playback('intercom&enabled')); 
     61          $ext->add('ext-intercom-users', $oncode, '', new ext_macro('hangupcall')); 
    6162        } 
    6263       
    …… 
    6667   
    6768        if ($offcode) { 
    68           $ext->add('ext-intercom', $offcode, '', new ext_answer('')); 
    69           $ext->add('ext-intercom', $offcode, '', new ext_wait('1')); 
    70           $ext->add('ext-intercom', $offcode, '', new ext_macro('user-callerid')); 
    71           $ext->add('ext-intercom', $offcode, '', new ext_setvar('DB(AMPUSER/${AMPUSER}/intercom)', 'disabled')); 
    72           $ext->add('ext-intercom', $offcode, '', new ext_playback('intercom&disabled')); 
    73           $ext->add('ext-intercom', $offcode, '', new ext_macro('hangupcall')); 
     69          $ext->add('ext-intercom-users', $offcode, '', new ext_answer('')); 
     70          $ext->add('ext-intercom-users', $offcode, '', new ext_wait('1')); 
     71          $ext->add('ext-intercom-users', $offcode, '', new ext_macro('user-callerid')); 
     72          $ext->add('ext-intercom-users', $offcode, '', new ext_setvar('DB(AMPUSER/${AMPUSER}/intercom)', 'disabled')); 
     73          $ext->add('ext-intercom-users', $offcode, '', new ext_playback('intercom&disabled')); 
     74          $ext->add('ext-intercom-users', $offcode, '', new ext_macro('hangupcall')); 
    7475        } 
    7576      } 

  • modules/branches/2.4/paging/module.xml

    r5025 r5161  
    22  <rawname>paging</rawname> 
    33  <name>Paging and Intercom</name> 
    4   <version>1.6.6</version> 
     4  <version>1.6.6.1</version> 
    55  <type>setup</type> 
    66  <category>Internal Options &amp; Configuration</category> 
    77  <changelog> 
     8    *1.6.6.1* #2376 enable/disable code broke in 1.6.6 and add user-callerid to get proper cid on intercom 
    89    *1.6.6* #2376 only interecept *80nnn for local extensions so branch offices can be intercomed 
    910    *1.6.5.2* bump for rc1