diff --git a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql index 76aa0e68..fa5b7cad 100644 --- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql @@ -138,7 +138,9 @@ length_in_sec INT(10), length_in_min DOUBLE(8,2), filename VARCHAR(50), location VARCHAR(255), -index (filename) +lead_id INT(9) UNSIGNED, +index (filename), +index(lead_id) ); CREATE TABLE live_inbound ( diff --git a/agc_2-X/trunk/extras/upgrade_2.0.2.sql b/agc_2-X/trunk/extras/upgrade_2.0.2.sql index d9d2607b..c0d99fa6 100644 --- a/agc_2-X/trunk/extras/upgrade_2.0.2.sql +++ b/agc_2-X/trunk/extras/upgrade_2.0.2.sql @@ -45,3 +45,6 @@ country_code SMALLINT(5) UNSIGNED ); ALTER TABLE vicidial_list ADD index (postal_code); + +ALTER TABLE recording_log ADD lead_id INT(9) UNSIGNED; +ALTER TABLE recording_log ADD index (lead_id); diff --git a/agc_2-X/trunk/www/agc/manager_send.php b/agc_2-X/trunk/www/agc/manager_send.php index 5581a926..4049b96c 100644 --- a/agc_2-X/trunk/www/agc/manager_send.php +++ b/agc_2-X/trunk/www/agc/manager_send.php @@ -62,6 +62,7 @@ # 60619-1158 - Added variable filters to close security holes for login form # 60809-1544 - Added direct transfers to leave-3ways in consultative transfers # 61004-1526 - Added parsing of volume control command and lookup or number +# 61130-1617 - Added lead_id to MonitorConf for recording_log # require("dbconnect.php"); @@ -131,8 +132,8 @@ if (!isset($ACTION)) {$ACTION="Originate";} if (!isset($format)) {$format="alert";} if (!isset($ext_priority)) {$ext_priority="1";} -$version = '0.0.26'; -$build = '61004-1526'; +$version = '2.0.27'; +$build = '61130-1617'; $StarTtime = date("U"); $NOW_DATE = date("Y-m-d"); $NOW_TIME = date("Y-m-d H:i:s"); @@ -881,7 +882,7 @@ if ( ($ACTION=="Monitor") || ($ACTION=="StopMonitor") ) if ($ACTION=="Monitor") { - $stmt = "INSERT INTO recording_log (channel,server_ip,extension,start_time,start_epoch,filename) values('$channel','$server_ip','$exten','$NOW_TIME','$StarTtime','$filename')"; + $stmt = "INSERT INTO recording_log (channel,server_ip,extension,start_time,start_epoch,filename,lead_id) values('$channel','$server_ip','$exten','$NOW_TIME','$StarTtime','$filename','$lead_id')"; if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); @@ -943,7 +944,7 @@ if ( ($ACTION=="MonitorConf") || ($ACTION=="StopMonitorConf") ) if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - $stmt = "INSERT INTO recording_log (channel,server_ip,extension,start_time,start_epoch,filename) values('$channel','$server_ip','$exten','$NOW_TIME','$StarTtime','$filename')"; + $stmt = "INSERT INTO recording_log (channel,server_ip,extension,start_time,start_epoch,filename,lead_id) values('$channel','$server_ip','$exten','$NOW_TIME','$StarTtime','$filename','$lead_id')"; if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); diff --git a/agc_2-X/trunk/www/agc/vicidial.php b/agc_2-X/trunk/www/agc/vicidial.php index 64f5c092..46e1cc90 100644 --- a/agc_2-X/trunk/www/agc/vicidial.php +++ b/agc_2-X/trunk/www/agc/vicidial.php @@ -130,6 +130,7 @@ # 61122-1341 - Added vicidial_user_groups allowed_campaigns restrictions # 61122-1523 - Added more SCRIPT variables # 61128-2229 - Added vicidial_live_agents and vicidial_auto_calls manual dial entries +# 61130-1617 - Added lead_id to MonitorConf for recording_log # require("dbconnect.php"); @@ -175,8 +176,8 @@ if (isset($_GET["relogin"])) {$relogin=$_GET["relogin"];} $forever_stop=0; -$version = '2.0.103'; -$build = '61128-2229'; +$version = '2.0.104'; +$build = '61130-1617'; if ($force_logout) { @@ -2047,7 +2048,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("RecorDControl").innerHTML = conf_rec_start_html; } } - confmonitor_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&user=" + user + "&pass=" + pass + "&ACTION=" + taskconfrectype + "&format=text&channel=" + channelrec + "&filename=" + filename + "&exten=" + query_recording_exten + "&ext_context=" + ext_context + "&ext_priority=1"; + confmonitor_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&user=" + user + "&pass=" + pass + "&ACTION=" + taskconfrectype + "&format=text&channel=" + channelrec + "&filename=" + filename + "&exten=" + query_recording_exten + "&ext_context=" + ext_context + "&lead_id=" + document.vicidial_form.lead_id.value + "&ext_priority=1"; xmlhttp.open('POST', 'manager_send.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(confmonitor_query); diff --git a/agc_2-X/trunk/www/vicidial/closer-fronter_popup.php b/agc_2-X/trunk/www/vicidial/closer-fronter_popup.php index 84d31c97..98938487 100644 --- a/agc_2-X/trunk/www/vicidial/closer-fronter_popup.php +++ b/agc_2-X/trunk/www/vicidial/closer-fronter_popup.php @@ -245,7 +245,7 @@ if ($parked_count > 0) if ($DB) {echo "|$stmt|\n";} $rslt=mysql_query($stmt, $link); - $stmt = "INSERT INTO recording_log (channel,server_ip,extension,start_time,start_epoch,filename) values('Zap/" . mysql_real_escape_string($channel) . "','" . mysql_real_escape_string($server_ip) . "','SIP/" . mysql_real_escape_string($SIPexten) . "','$NOW_TIME','$STARTtime','" . mysql_real_escape_string($filename) . "')"; + $stmt = "INSERT INTO recording_log (channel,server_ip,extension,start_time,start_epoch,filename,lead_id) values('Zap/" . mysql_real_escape_string($channel) . "','" . mysql_real_escape_string($server_ip) . "','SIP/" . mysql_real_escape_string($SIPexten) . "','$NOW_TIME','$STARTtime','" . mysql_real_escape_string($filename) . "','$lead_id')"; if ($DB) {echo "|$stmt|\n";} $rslt=mysql_query($stmt, $link); diff --git a/agc_2-X/trunk/www/vicidial/closer-fronter_popup2.php b/agc_2-X/trunk/www/vicidial/closer-fronter_popup2.php index 2ecd56d1..8914ed35 100644 --- a/agc_2-X/trunk/www/vicidial/closer-fronter_popup2.php +++ b/agc_2-X/trunk/www/vicidial/closer-fronter_popup2.php @@ -259,7 +259,7 @@ if ($parked_count > 0) if ($DB) {echo "|$stmt|\n";} $rslt=mysql_query($stmt, $link); - $stmt = "INSERT INTO recording_log (channel,server_ip,extension,start_time,start_epoch,filename) values('$channel','" . mysql_real_escape_string($server_ip) . "','SIP/" . mysql_real_escape_string($SIPexten) . "','$NOW_TIME','$STARTtime','" . mysql_real_escape_string($filename) . "')"; + $stmt = "INSERT INTO recording_log (channel,server_ip,extension,start_time,start_epoch,filename,lead_id) values('$channel','" . mysql_real_escape_string($server_ip) . "','SIP/" . mysql_real_escape_string($SIPexten) . "','$NOW_TIME','$STARTtime','" . mysql_real_escape_string($filename) . "','$lead_id')"; if ($DB) {echo "|$stmt|\n";} $rslt=mysql_query($stmt, $link);