Changeset 8176

Show
Ignore:
Timestamp:
08/26/09 01:37:59 (4 years ago)
Author:
p_lindheimer
Message:

closes #3430 check blacklist after privacy manager if blacklist was enabled

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.6/blacklist/functions.inc.php

    r7637 r8176  
    5151        $ext->add($id, $c, '', new ext_gotoif('$["${LOOKUPBLSTATUS}"="FOUND"]', 'blacklisted')); 
    5252      } 
     53      $ext->add($id, $c, '', new ext_setvar('CALLED_BLACKLIST','1')); 
    5354      $ext->add($id, $c, '', new ext_return('')); 
    5455      $ext->add($id, $c, 'blacklisted', new ext_answer('')); 

  • modules/branches/2.6/blacklist/module.xml

    r8070 r8176  
    22  <rawname>blacklist</rawname> 
    33  <name>Blacklist</name> 
    4   <version>2.6.0.1</version> 
     4  <version>2.6.0.2</version> 
    55  <publisher>FreePBX</publisher> 
    66  <license>GPLv2+</license> 
    …… 
    1111  </menuitems> 
    1212  <changelog> 
     13    *2.6.0.2* #3430 
    1314    *2.6.0.1* Added publisher/lic 
    1415    *2.6.0.0* Added support for Unknown/Blocked CID 

  • modules/branches/2.6/core/etc/extensions.conf

    r7728 r8176  
    485485exten => s,n(PRIVMGR),PrivacyManager() 
    486486exten => s,n,GotoIf($["${PRIVACYMGRSTATUS}"="FAILED"]?fail) 
     487exten => s,n,GosubIf($["${CALLED_BLACKLIST}" = "1"]?app-blacklist-check,s,1) 
    487488exten => s,n,SetCallerPres(allowed_passed_screen); stop gap until app_privacy.c clears unavailable bit 
    488489exten => s,PRIVMGR+101(fail),Noop(STATUS: ${PRIVACYMGRSTATUS} CID: ${CALLERID(num)} ${CALLERID(name)} CALLPRES: ${CALLLINGPRES}) 

  • modules/branches/2.6/core/module.xml

    r8174 r8176  
    1010  <canuninstall>no</canuninstall> 
    1111  <changelog> 
    12     *2.6.0beta1.4* #3075, #3501, #3636, #3581, #3266, #3701, #3545 
     12    *2.6.0beta1.4* #3075, #3501, #3636, #3581, #3266, #3701, #3545, #3430 
    1313    *2.6.0beta1.3* trunk tab improvements 
    1414    *2.6.0beta1.2* added more sql escape in devices