Changeset 6566
- Timestamp:
- 09/04/08 14:49:05 (3 months ago)
- Files:
-
- freepbx/branches/2.2 (modified) (1 prop)
- freepbx/branches/2.2/amp_conf/htdocs/recordings/modules/callmonitor.module (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
freepbx/branches/2.2
- Property svnmerge-integrated changed from /freepbx/branches/2.3:1-4135,4219,4249,4258,4262,4273,4277,4282,4289,4307,4310-4322,4357,4400,4561 /freepbx/trunk:1-3224,3231,3245-3246,3291-3295,3297,3299-3332,3336,3338-3365,3367-3373,3375-3388,3390-3391,3393-3395,3419,3437,3567,3614-3622,3624,3652,3688,3696,3756,3850,3885,4005,4084,4105 to /freepbx/branches/2.3:1-4135,4219,4249,4258,4262,4273,4277,4282,4289,4307,4310-4322,4357,4400,4561,6565 /freepbx/trunk:1-3224,3231,3245-3246,3291-3295,3297,3299-3332,3336,3338-3365,3367-3373,3375-3388,3390-3391,3393-3395,3419,3437,3567,3614-3622,3624,3652,3688,3696,3756,3850,3885,4005,4084,4105
freepbx/branches/2.2/amp_conf/htdocs/recordings/modules/callmonitor.module
r1773 r6566 203 203 204 204 // table body 205 foreach($data as $key=>$value) {205 if (is_array($data)) foreach($data as $key=>$value) { 206 206 207 207 // recording file … … 384 384 } 385 385 386 foreach($data as $data_key => $data_value) {386 if (is_array($data)) foreach($data as $data_key => $data_value) { 387 387 388 388 $recording=''; … … 546 546 // search text 547 547 if ($q!='*' && $q!=NULL) { 548 549 $dbh = $_SESSION['dbh_cdr']; 548 550 $searchText .= "WHERE "; 549 551 $tok = strtok($q," \n\t"); 552 $tok = $dbh->escapeSimple($tok); 550 553 while ($tok) { 551 554 $searchText .= " (calldate regexp '" . $tok . "' … … 561 564 )"; 562 565 $tok = strtok(" \n\t"); 566 $tok = $dbh->escapeSimple($tok); 563 567 if ($tok) { 564 568 $searchText .= " AND";
