diff --git a/agc_2-X/trunk/www/vicidial/realtime_report.php b/agc_2-X/trunk/www/vicidial/realtime_report.php index 886f99ca..1ea0bd66 100644 --- a/agc_2-X/trunk/www/vicidial/realtime_report.php +++ b/agc_2-X/trunk/www/vicidial/realtime_report.php @@ -40,12 +40,13 @@ # 170321-1145 - Added pause code time limits colors # 170409-1557 - Added IP List validation code # 180330-1344 - Added fix for WebRTC webphone microphone permissions +# 181128-1040 - Added external_web_socket_url option # $startMS = microtime(); -$version = '2.14-28'; -$build = '180330-1344'; +$version = '2.14-29'; +$build = '181128-1040'; header ("Content-type: text/html; charset=utf-8"); @@ -956,12 +957,15 @@ if (strlen($monitor_phone)>1) $codecs_list = preg_replace("/-/",'',$codecs_list); $codecs_list = preg_replace("/&/",'',$codecs_list); - $stmt="SELECT asterisk_version,web_socket_url from servers where server_ip='$webphone_server_ip' LIMIT 1;"; + $stmt="SELECT asterisk_version,web_socket_url,external_web_socket_url from servers where server_ip='$webphone_server_ip' LIMIT 1;"; if ($DB) {echo "|$stmt|\n";} $rslt=mysql_to_mysqli($stmt, $link); $row=mysqli_fetch_row($rslt); - $asterisk_version = $row[0]; - $web_socket_url = $row[1]; + $asterisk_version = $row[0]; + $web_socket_url = $row[1]; + $external_web_socket_url = $row[2]; + if ( ($use_external_server_ip=='Y') and (strlen($external_web_socket_url) > 5) ) + {$web_socket_url = $external_web_socket_url;} if ($use_external_server_ip=='Y') { @@ -1029,7 +1033,7 @@ if (strlen($monitor_phone)>1) $b64_system_key = base64_encode($system_key); $WebPhonEurl = "$webphone_url?phone_login=$b64_phone_login&phone_login=$b64_phone_login&phone_pass=$b64_phone_pass&server_ip=$b64_server_ip&callerid=$b64_callerid&protocol=$b64_protocol&codecs=$b64_codecs&options=$b64_options&system_key=$b64_system_key"; - $webphone_content = ""; + $webphone_content = ""; } } }