Changeset 8222

Show
Ignore:
Timestamp:
08/27/09 22:30:36 (1 year ago)
Author:
p_lindheimer
Message:

fixes #3835 and re #3291 - we should redo how the trunks are searched now that we have the trunk table plus there is an option for a descriptive name that should be used if present

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.6/amp_conf/bin/retrieve_op_conf_from_mysql.php

    r8218 r8222  
    403403foreach ($tables as $table) { 
    404404        if (table_exists($db,$table)) { 
    405                 $statement = "SELECT data,id,'$table' from $table where keyword='account' and flags <> 1 and id>99990 group by data order by id"; 
     405                $statement = "SELECT data,id,'$table' from $table where keyword='account' and flags <> 1 and id LIKE 'tr-%' group by data order by id"; 
    406406                $results = $db->getAll($statement); 
    407407                if(DB::IsError($results)) { 
    …… 
    564564                if ($btn == 0) {last;} 
    565565                if (table_exists($db,$table)) { 
    566                 $statement = "SELECT keyword,data from $table where id=$id and keyword <> 'account' and flags <> 1 order by keyword"; 
     566                $statement = "SELECT keyword,data from $table where id='$id' and keyword <> 'account' and flags <> 1 order by keyword"; 
    567567                        $results = $db->getAll($statement); 
    568568                        if(DB::IsError($results)) {