Show
Ignore:
Timestamp:
05/16/11 21:29:39 (2 years ago)
Author:
p_lindheimer
Message:

Merged revisions 11124-11125,11128-11133,11135,11137,11145-11147,11149,11166,11168,11216,11228-11229,11240-11241,11243-11244,11255,11263-11264,11272,11278,11280,11282,11285,11291-11293,11300,11302,11321,11334,11339-11343,11352,11363-11364,11366,11368,11382-11384,11388-11390,11399,11405-11406,11421,11449,11453-11460,11462-11464,11471,11482,11485-11487,11493-11494,11498,11502,11504,11528,11530,11535,11543,11555,11558,11574-11576,11579,11581,11583,11585-11587,11589,11591-11592,11599,11622,11629,11631,11633,11637-11639,11641,11652,11662-11663,11666,11668,11671-11672,11675-11676,11704,11711,11714,11719,11721,11723,11725-11726,11732,11755,11760,11762-11764,11767,11769-11770,11772-11774,11796,11799-11800,11805,11807,11810,11812,11818,11822,11826,11828,11830,11841-11842,11853-11855,11891-11892,11900,11928,11931,11937-11940,11944,11954,11960,11968,11971-11974,11986-11987,12016,12021-12022,12024,12036-12037,12044-12046,12056,12061,12066,12068,12073,12076,12154-12156 via svnmerge from

Merged 2.9 branch to trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk

    • Property svnmerge-integrated changed from /freepbx/branches/2.9:1-11117 to /freepbx/branches/2.9:1-12166

  • freepbx/trunk/amp_conf/bin/archive_recordings

    r11090 r12167  
    55//include bootstrap 
    66$bootstrap_settings['freepbx_auth'] = false; 
     7$bootstrap_settings['cdrdb'] = true; 
    78if (!@include_once(getenv('FREEPBX_CONF') ? getenv('FREEPBX_CONF') : '/etc/freepbx.conf')) { 
    89  include_once('/etc/asterisk/freepbx.conf'); 
    …… 
    105106 
    106107function check_table() { 
    107   global $db; 
     108  global $cdrdb; 
    108109  global $debug; 
    109110  outn("Verifying CDR 'uniqueid' field exisits.."); 
    110111  $sql = "SELECT uniqueid FROM cdr WHERE NOT uniqueid=\"\""; 
    111112  if ($debug) {out(""); debug("Query: ".$sql);} 
    112   $result = $db->query($sql);  
    113   if(DB::IsError($result)) {      
     113  $result = $cdrdb->query($sql);  
     114  if($cdrdb->IsError($result)) {      
    114115    fatal($result->getDebugInfo()."\" while running ".$sql."\n");  
    115116  } 
    …… 
    143144 
    144145function get_cdr($datetime,$uniqueid,$calltype) { 
    145   global $db; 
     146  global $cdrdb; 
    146147  global $debug; 
    147148  $datetimes = fix_datetime($datetime); 
    148149  $sql = "SELECT * FROM cdr WHERE uniqueid = '$uniqueid' AND calldate BETWEEN '".$datetimes['allow']."' AND '".$datetimes['exact']."'"; 
    149150  if ($debug) {out(""); debug("Query: ".$sql);} 
    150   $result = $db->getRow($sql);  
    151   if(DB::IsError($result)) {      
     151  $result = $cdrdb->getRow($sql);  
     152  if($cdrdb->IsError($result)) {      
    152153    fatal($result->getDebugInfo()."\" while running ".$sql."\n");  
    153154  }