Changeset 3999

Show
Ignore:
Timestamp:
06/07/07 22:49:09 (6 years ago)
Author:
p_lindheimer
Message:

Merged revisions 3998 via svnmerge from
https://amportal.svn.sourceforge.net/svnroot/amportal/modules/branches/2.2

........

r3998 | p_lindheimer | 2007-06-07 19:47:08 -0700 (Thu, 07 Jun 2007) | 1 line


Replaced deprecated CALLERIDNAME and TIMSTAMP variables with the current and future supported versions

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.3

    • Property svnmerge-integrated changed from /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990 to /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998

  • modules/branches/2.3/queues/functions.inc.php

    r3721 r3999  
    5151          $ext->add('ext-queues', $exten, '', new ext_gotoif('$["${CONTEXT}"="from-internal"]','USERCID','SETCID')); 
    5252          $ext->add('ext-queues', $exten, 'USERCID', new ext_macro('user-callerid')); 
    53           $ext->add('ext-queues', $exten, 'SETCID', new ext_setcidname($q['prefix'].'${CALLERIDNAME}')); 
    54           $ext->add('ext-queues', $exten, '', new ext_setvar('MONITOR_FILENAME','/var/spool/asterisk/monitor/q${EXTEN}-${TIMESTAMP}-${UNIQUEID}')); 
     53          $ext->add('ext-queues', $exten, 'SETCID', new ext_setcidname($q['prefix'].'${CALLERID(name)}')); 
     54          $ext->add('ext-queues', $exten, '', new ext_setvar('MONITOR_FILENAME','/var/spool/asterisk/monitor/q${EXTEN}-${STRFTIME(${EPOCH},,%Y%m%d-%H%M%S)}-${UNIQUEID}')); 
    5555          $joinannounce = (isset($q['joinannounce'])?$q['joinannounce']:''); 
    5656          if($joinannounce != "") { 
    …… 
    125125  $addarray = array('ext-queues',$account,'1','Answer',''.'','','0'); 
    126126  legacy_extensions_add($addarray); 
    127   $addarray = array('ext-queues',$account,'2','SetCIDName',$prefix.'${CALLERIDNAME}','','0'); 
    128   legacy_extensions_add($addarray); 
    129   $addarray = array('ext-queues',$account,'3','SetVar','MONITOR_FILENAME=/var/spool/asterisk/monitor/q${EXTEN}-${TIMESTAMP}-${UNIQUEID}','','0'); 
     127  $addarray = array('ext-queues',$account,'2','SetCIDName',$prefix.'${CALLERID(name)}','','0'); 
     128  legacy_extensions_add($addarray); 
     129  $addarray = array('ext-queues',$account,'3','SetVar','MONITOR_FILENAME=/var/spool/asterisk/monitor/q${EXTEN}-${STRFTIME(${EPOCH},,%Y%m%d-%H%M%S)}-${UNIQUEID}','','0'); 
    130130  legacy_extensions_add($addarray); 
    131131  if ($joinannounce != 'None') { 
    …… 
    276276  $sql = "SELECT args FROM extensions WHERE extension = '$account' AND context = 'ext-queues' AND application = 'SetCIDName'"; 
    277277  list($args) = $db->getRow($sql); 
    278   $prefix = explode('$',$args); //in table like prefix${CALLERIDNAME} 
     278  $prefix = explode('$',$args); //in table like prefix${CALLERID(name)} 
    279279  $results['prefix'] = $prefix[0];   
    280280   

  • modules/branches/2.3/queues/module.xml

    r3842 r3999  
    22  <rawname>queues</rawname> 
    33  <name>Queues</name> 
    4   <version>2.2.8.1</version> 
     4  <version>2.2.9</version> 
    55  <type>setup</type> 
    66  <category>Inbound Call Control</category> 
    …… 
    99  </description> 
    1010  <changelog> 
     11    *2.2.9* Replaced deprecated CALLERIDNAME and TIMSTAMP variables with the current and future supported versions 
    1112    *2.2.8.1* Updated tootip to warn about agents.conf (unsupported and know issues) and warn about penalties (broken in asterisk) 
    1213    *2.2.8* Fixed typo in 2.2.7