Changeset 9417

Show
Ignore:
Timestamp:
03/27/10 17:44:02 (3 years ago)
Author:
p_lindheimer
Message:

Merged revisions 9414-9416 via svnmerge from
http://svn.freepbx.org/modules/branches/2.6

........

r9414 | p_lindheimer | 2010-03-27 14:31:13 -0700 (Sat, 27 Mar 2010) | 1 line


fixes #3979 cidlookup sources not being generated

........

r9416 | p_lindheimer | 2010-03-27 14:39:19 -0700 (Sat, 27 Mar 2010) | 1 line


really fixes #3979 glad I haven't published for real yet

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.7

    • Property svnmerge-integrated changed from /modules/branches/2.6:1-8497,8589,8613,8620,8651,8672 /modules/branches/2.8:1-9044,9107,9122,9218,9366 to /modules/branches/2.6:1-8497,8589,8613,8620,8651,8672,9414-9416 /modules/branches/2.8:1-9044,9107,9122,9218,9366

  • modules/branches/2.7/cidlookup/functions.inc.php

    r9407 r9417  
    121121  switch($engine) { 
    122122    case "asterisk": 
    123       $sources = cidlookup_list(); 
     123      $sources = cidlookup_list(true); 
    124124      if(is_array($sources)) { 
    125125        foreach($sources as $item) { 
    …… 
    246246} 
    247247 
    248 function cidlookup_list() { 
    249   // TODO: discuss department isolation of sources 
     248function cidlookup_list($all=false) { 
    250249  $allowed = array(array('cidlookup_id' => 0, 'description' => _("None"), 'sourcetype' => null)); 
    251250  $results = sql("SELECT * FROM cidlookup","getAll",DB_FETCHMODE_ASSOC); 
    …… 
    253252    foreach($results as $result){ 
    254253      // check to see if we have a dept match for the current AMP User. 
    255       if (checkDept($result['deptname'])){ 
     254      if ($all || checkDept($result['deptname'])){ 
    256255        // return this item 
    257256        $allowed[] = $result; 

  • modules/branches/2.7/cidlookup/module.xml

    r9408 r9417  
    22  <rawname>cidlookup</rawname> 
    33  <name>Caller ID Lookup</name> 
    4   <version>2.7.0.1</version> 
     4  <version>2.7.0.2</version> 
    55  <publisher>FreePBX</publisher> 
    66  <license>GPLv2+</license> 
    …… 
    1818  <md5sum>45a30d653996845025a9ba510edde5b5</md5sum> 
    1919  <changelog> 
     20    *2.7.0.2* #3979 
    2021    *2.7.0.1* might effect #3979 
    2122    *2.7.0.0* localizations