Show
Ignore:
Timestamp:
03/25/10 19:38:24 (3 years ago)
Author:
p_lindheimer
Message:

Merged revisions 9378-9388 via svnmerge from
http://svn.freepbx.org/modules/branches/2.7

........

r9379 | p_lindheimer | 2010-03-24 16:06:43 -0700 (Wed, 24 Mar 2010) | 1 line


Module Publish Script: fax 2.7.0.18

........

r9387 | p_lindheimer | 2010-03-25 16:34:35 -0700 (Thu, 25 Mar 2010) | 1 line


closes #4166 call StopPlayTones? prior to trying to receive a fax, apparently neither ReceiveFax? nor RxFax? are able to negotiate a fax receptions under certain conditions without it despite many installations working fine...

........

r9388 | p_lindheimer | 2010-03-25 16:35:01 -0700 (Thu, 25 Mar 2010) | 1 line


Module Publish Script: fax 2.7.0.19

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.8

    • Property svnmerge-integrated changed from /modules/branches/2.7:1-9377 to /modules/branches/2.7:1-9388

  • modules/branches/2.8/fax/functions.inc.php

    r9366 r9389  
    229229    $ext->add($context, $exten, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid) 
    230230    $ext->add($context, $exten, '', new ext_noop('Receiving Fax for: ${FAX_RX_EMAIL} , From: ${CALLERID(all)}')); 
     231    $ext->add($context, $exten, 'receivefax', new ext_stopplaytones('')); 
    231232    switch ($fax['module']) { 
    232233    case 'app_rxfax': 
    233       $ext->add($context, $exten, 'receivefax', new ext_rxfax('${ASTSPOOLDIR}/fax/${UNIQUEID}.tif')); //recive fax, then email it on 
     234      $ext->add($context, $exten, '', new ext_rxfax('${ASTSPOOLDIR}/fax/${UNIQUEID}.tif')); //recive fax, then email it on 
    234235    break; 
    235236    case 'app_fax': 
    …… 
    237238      // ReceiveFAX in that case since it will fail anyhow. 
    238239      if ($fax['receivefax'] == 'rxfax') { 
    239         $ext->add($context, $exten, 'receivefax', new ext_rxfax('${ASTSPOOLDIR}/fax/${UNIQUEID}.tif')); //recive fax, then email it on 
     240        $ext->add($context, $exten, '', new ext_rxfax('${ASTSPOOLDIR}/fax/${UNIQUEID}.tif')); //recive fax, then email it on 
    240241      } elseif ($fax['receivefax'] == 'receivefax') { 
    241         $ext->add($context, $exten, 'receivefax', new ext_receivefax('${ASTSPOOLDIR}/fax/${UNIQUEID}.tif')); //recive fax, then email it on 
     242        $ext->add($context, $exten, '', new ext_receivefax('${ASTSPOOLDIR}/fax/${UNIQUEID}.tif')); //recive fax, then email it on 
    242243      } else { 
    243         $ext->add($context, $exten, 'receivefax', new ext_noop('ERROR: NO Receive FAX application detected, putting in dialplan for ReceiveFAX as default')); 
     244        $ext->add($context, $exten, '', new ext_noop('ERROR: NO Receive FAX application detected, putting in dialplan for ReceiveFAX as default')); 
    244245        $ext->add($context, $exten, '', new ext_receivefax('${ASTSPOOLDIR}/fax/${UNIQUEID}.tif')); //recive fax, then email it on 
    245246        $ext->add($context, $exten, '', new ext_execif('$["${FAXSTATUS}" = ""]','Set','FAXSTATUS=${IF($["${FAXOPT(error)}" = ""]?"FAILED LICENSE EXCEEDED":"FAILED FAXOPT: error: ${FAXOPT(error)} status: ${FAXOPT(status)} statusstr: ${FAXOPT(statusstr)}")}')); 
    …… 
    247248    break; 
    248249    case 'res_fax': 
    249       $ext->add($context, $exten, 'receivefax', new ext_receivefax('${ASTSPOOLDIR}/fax/${UNIQUEID}.tif')); //recive fax, then email it on 
     250      $ext->add($context, $exten, '', new ext_receivefax('${ASTSPOOLDIR}/fax/${UNIQUEID}.tif')); //recive fax, then email it on 
    250251      // Some versions or settings appear to have successful completions continue, so check status and goto hangup code 
    251252      $ext->add($context, $exten, '', new ext_execif('$["${FAXOPT(error)}"=""]','Set','FAXSTATUS=FAILED LICENSE EXCEEDED')); 

  • modules/branches/2.8/fax/module.xml

    r9381 r9389  
    22  <rawname>fax</rawname> 
    33  <name>Fax Configuration</name> 
    4   <version>2.8.0.1</version> 
     4  <version>2.8.0.2</version> 
    55  <publisher>Schmoozecom.com</publisher> 
    66  <license>GPLv2+</license> 
    …… 
    1212  <description>Adds configurations, options and GUI for inbound faxing</description> 
    1313  <changelog> 
     14    *2.8.0.2* #4166 
    1415    *2.8.0.1* #4118 
    1516    *2.8.0.0* #4099, #4117, adjust presentation becasue of #1798