diff --git a/extras/MySQL_AST_CREATE_tables.sql b/extras/MySQL_AST_CREATE_tables.sql index 5909d2f4..f0bd15a4 100644 --- a/extras/MySQL_AST_CREATE_tables.sql +++ b/extras/MySQL_AST_CREATE_tables.sql @@ -92,7 +92,9 @@ sys_perf_log ENUM('Y','N') default 'N', vd_server_logs ENUM('Y','N') default 'Y', agi_output ENUM('NONE','STDERR','FILE','BOTH') default 'FILE', vicidial_balance_active ENUM('Y','N') default 'N', -balance_trunks_offlimits SMALLINT(5) UNSIGNED default '0' +balance_trunks_offlimits SMALLINT(5) UNSIGNED default '0', +recording_web_link ENUM('SERVER_IP','ALT_IP') default 'SERVER_IP', +alt_server_ip VARCHAR(100) default '' ); CREATE UNIQUE INDEX server_id on servers (server_id); diff --git a/extras/upgrade_2.0.5.sql b/extras/upgrade_2.0.5.sql index 41bab3dd..79aefd90 100644 --- a/extras/upgrade_2.0.5.sql +++ b/extras/upgrade_2.0.5.sql @@ -548,3 +548,8 @@ UPDATE system_settings SET db_schema_version='1118'; ALTER TABLE vicidial_campaigns ADD web_form_target VARCHAR(100) NOT NULL default 'vdcwebform'; UPDATE system_settings SET db_schema_version='1119'; + +ALTER TABLE servers ADD recording_web_link ENUM('SERVER_IP','ALT_IP') default 'SERVER_IP'; +ALTER TABLE servers ADD alt_server_ip VARCHAR(100) default ''; + +UPDATE system_settings SET db_schema_version='1120'; diff --git a/translations/raw_translation_files/TO_BE_TRANSLATED_2.0.5.txt b/translations/raw_translation_files/TO_BE_TRANSLATED_2.0.5.txt index 8a34101b..3400761c 100644 --- a/translations/raw_translation_files/TO_BE_TRANSLATED_2.0.5.txt +++ b/translations/raw_translation_files/TO_BE_TRANSLATED_2.0.5.txt @@ -343,6 +343,9 @@ Stats Percent of Calls Answered Within X seconds|| Web Form Target-<\/B> This is where you can set the custom web page frame that the web form will be opened in when the user clicks on the WEB FORM button. Default is _blank.|| Web Form Target|| To customize the query string after the web form, simply begin the web form with VAR and then the URL that you want to use, replacing the variables with the variable names that you want to use --A--phone_number--B-- just like in the SCRIPTS tab section|| +Recording Web Link -<\/B> This setting allows you to override the default of the display of the recording link in the admin web pages. Default is SERVER_IP|| +Alternate Recording Server IP -<\/B> This setting is where you can put a server IP or other machine name that can be used in place of the server_ip in the links to recordings within the admin web pages. Default is empty|| +Recording Web Link|| ############################################################ CLIENT diff --git a/www/vicidial/admin.php b/www/vicidial/admin.php index 2d8985bd..12466c0c 100644 --- a/www/vicidial/admin.php +++ b/www/vicidial/admin.php @@ -857,6 +857,10 @@ if (isset($_GET["list_active_change"])) {$list_active_change=$_GET["list_acti elseif (isset($_POST["list_active_change"])) {$list_active_change=$_POST["list_active_change"];} if (isset($_GET["web_form_target"])) {$web_form_target=$_GET["web_form_target"];} elseif (isset($_POST["web_form_target"])) {$web_form_target=$_POST["web_form_target"];} +if (isset($_GET["alt_server_ip"])) {$alt_server_ip=$_GET["alt_server_ip"];} + elseif (isset($_POST["alt_server_ip"])) {$alt_server_ip=$_POST["alt_server_ip"];} +if (isset($_GET["recording_web_link"])) {$recording_web_link=$_GET["recording_web_link"];} + elseif (isset($_POST["recording_web_link"])) {$recording_web_link=$_POST["recording_web_link"];} if (isset($script_id)) {$script_id= strtoupper($script_id);} @@ -1221,6 +1225,7 @@ $hold_time_option_callback_filename = ereg_replace("[^-\_0-9a-zA-Z]","",$hold_ti $exten_context = ereg_replace("[^-\_0-9a-zA-Z]","",$exten_context); $three_way_call_cid = ereg_replace("[^-\_0-9a-zA-Z]","",$three_way_call_cid); $web_form_target = ereg_replace("[^-\_0-9a-zA-Z]","",$web_form_target); +$recording_web_link = ereg_replace("[^-\_0-9a-zA-Z]","",$recording_web_link); ### ALPHA-NUMERIC and underscore and dash and comma $logins_list = ereg_replace("[^-\,\_0-9a-zA-Z]","",$logins_list); @@ -1273,6 +1278,7 @@ $code_name = ereg_replace("[^ \.\,-\_0-9a-zA-Z]","",$code_name); $alias_name = ereg_replace("[^ \.\,-\_0-9a-zA-Z]","",$alias_name); $shift_name = ereg_replace("[^ \.\,-\_0-9a-zA-Z]","",$shift_name); $did_description = ereg_replace("[^ \.\,-\_0-9a-zA-Z]","",$did_description); +$alt_server_ip = ereg_replace("[^ \.\,-\_0-9a-zA-Z]","",$alt_server_ip); ### ALPHA-NUMERIC and underscore and dash and slash and at and dot $call_out_number_group = ereg_replace("[^-\.\:\/\@\_0-9a-zA-Z]","",$call_out_number_group); @@ -1483,11 +1489,12 @@ $survey_camp_record_dir = ereg_replace(";","",$survey_camp_record_dir); # 81118-0933 - Changed lists listing with links and more options # 81119-0715 - Added ability to bulk enable/disable lists from modify campaign screen # 81209-1538 - Added web_form_target to campaign screen +# 81210-1430 - Added http server IP and recording link options to servers # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time -$admin_version = '2.0.5-152'; -$build = '81209-1538'; +$admin_version = '2.0.5-153'; +$build = '81210-1430'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -4253,6 +4260,18 @@ The VICIDIAL basic web-based lead loader is designed simply to take a lead file
VICIDIAL Balance Offlimits - This setting defines the number of trunks to not allow VICIDIAL balance dialing to use. For example if you have 40 max vicidial trunks and balance offlimits is set to 10 you will only be able to use 30 trunk lines for VICIDIAL balance dialing. Default is 0. +
+ +
+Recording Web Link - This setting allows you to override the default of the display of the recording link in the admin web pages. Default is SERVER_IP. + +
+ +
+Alternate Recording Server IP - This setting is where you can put a server IP or other machine name that can be used in place of the server_ip in the links to recordings within the admin web pages. Default is empty. + + +



@@ -9022,7 +9041,7 @@ if ($ADD==411111111111) { echo "
SERVER MODIFIED: $server_ip\n"; - $stmt="UPDATE servers set server_id='$server_id',server_description='$server_description',server_ip='$server_ip',active='$active',asterisk_version='$asterisk_version', max_vicidial_trunks='$max_vicidial_trunks', telnet_host='$telnet_host', telnet_port='$telnet_port', ASTmgrUSERNAME='$ASTmgrUSERNAME', ASTmgrSECRET='$ASTmgrSECRET', ASTmgrUSERNAMEupdate='$ASTmgrUSERNAMEupdate', ASTmgrUSERNAMElisten='$ASTmgrUSERNAMElisten', ASTmgrUSERNAMEsend='$ASTmgrUSERNAMEsend', local_gmt='$local_gmt', voicemail_dump_exten='$voicemail_dump_exten', answer_transfer_agent='$answer_transfer_agent', ext_context='$ext_context', sys_perf_log='$sys_perf_log', vd_server_logs='$vd_server_logs', agi_output='$agi_output', vicidial_balance_active='$vicidial_balance_active', balance_trunks_offlimits='$balance_trunks_offlimits' where server_id='$old_server_id';"; + $stmt="UPDATE servers set server_id='$server_id',server_description='$server_description',server_ip='$server_ip',active='$active',asterisk_version='$asterisk_version', max_vicidial_trunks='$max_vicidial_trunks', telnet_host='$telnet_host', telnet_port='$telnet_port', ASTmgrUSERNAME='$ASTmgrUSERNAME', ASTmgrSECRET='$ASTmgrSECRET', ASTmgrUSERNAMEupdate='$ASTmgrUSERNAMEupdate', ASTmgrUSERNAMElisten='$ASTmgrUSERNAMElisten', ASTmgrUSERNAMEsend='$ASTmgrUSERNAMEsend', local_gmt='$local_gmt', voicemail_dump_exten='$voicemail_dump_exten', answer_transfer_agent='$answer_transfer_agent', ext_context='$ext_context', sys_perf_log='$sys_perf_log', vd_server_logs='$vd_server_logs', agi_output='$agi_output', vicidial_balance_active='$vicidial_balance_active', balance_trunks_offlimits='$balance_trunks_offlimits',recording_web_link='$recording_web_link',alt_server_ip='$alt_server_ip' where server_id='$old_server_id';"; $rslt=mysql_query($stmt, $link); ### LOG CHANGES TO LOG FILE ### @@ -15065,6 +15084,8 @@ if ($ADD==311111111111) echo "System Performance: $NWB#servers-sys_perf_log$NWE\n"; echo "Server Logs: $NWB#servers-vd_server_logs$NWE\n"; echo "AGI Output: $NWB#servers-agi_output$NWE\n"; + echo "Recording Web Link: $NWB#servers-recording_web_link$NWE\n"; + echo "Alternate Recording Server IP: $NWB#servers-alt_server_ip$NWE\n"; echo "\n"; echo "\n"; diff --git a/www/vicidial/admin_modify_lead.php b/www/vicidial/admin_modify_lead.php index 86fe08ba..cbed9eab 100644 --- a/www/vicidial/admin_modify_lead.php +++ b/www/vicidial/admin_modify_lead.php @@ -27,6 +27,7 @@ # 80516-0936 - Cleanup of logging changes, added vicidial_agent_log display # 80701-0832 - Changed to allow for altering of main phone number # 80805-2106 - Changed comments to TEXTAREA +# 81210-1529 - Added server recording display options # require("dbconnect.php"); @@ -380,7 +381,7 @@ else $agent_log .= "$y"; $agent_log .= "$row[3]"; $agent_log .= " $row[5]\n"; - $agent_log .= " $row[1] \n"; + $agent_log .= " $row[1] \n"; $agent_log .= " $row[7]\n"; $agent_log .= " $row[9] \n"; $agent_log .= " $row[11] \n"; @@ -636,9 +637,9 @@ echo "RECORDINGS FOR THIS LEAD:\n"; echo "\n"; echo "\n"; - $stmt="select * from recording_log where lead_id='" . mysql_real_escape_string($lead_id) . "' order by recording_id desc limit 500;"; - $rslt=mysql_query($stmt, $link); - $logs_to_print = mysql_num_rows($rslt); +$stmt="select * from recording_log where lead_id='" . mysql_real_escape_string($lead_id) . "' order by recording_id desc limit 500;"; +$rslt=mysql_query($stmt, $link); +$logs_to_print = mysql_num_rows($rslt); $u=0; while ($logs_to_print > $u) @@ -650,6 +651,30 @@ echo "
# LEADDATE/TIME SECONDS   RECIDFILENAMELOCATIONTSR
# LEAD2) + { + $URLserver_ip = $location; + $URLserver_ip = eregi_replace('http://','',$URLserver_ip); + $URLserver_ip = eregi_replace('https://','',$URLserver_ip); + $URLserver_ip = eregi_replace("\/.*",'',$URLserver_ip); + $stmt="select count(*) from servers where server_ip='$URLserver_ip';"; + $rsltx=mysql_query($stmt, $link); + $rowx=mysql_fetch_row($rsltx); + + if ($rowx[0] > 0) + { + $stmt="select recording_web_link,alt_server_ip from servers where server_ip='$URLserver_ip';"; + $rsltx=mysql_query($stmt, $link); + $rowx=mysql_fetch_row($rsltx); + + if (eregi("ALT_IP",$rowx[0])) + { + $location = eregi_replace($URLserver_ip, $rowx[1], $location); + } + } + } + if (strlen($location)>30) {$locat = substr($location,0,27); $locat = "$locat...";} else diff --git a/www/vicidial/user_stats.php b/www/vicidial/user_stats.php index 18b2e4c4..49c8cd91 100644 --- a/www/vicidial/user_stats.php +++ b/www/vicidial/user_stats.php @@ -13,6 +13,7 @@ # 80501-0506 - Added Hangup Reason to logs display # 80523-2012 - Added vicidial timeclock records display # 80617-1402 - Fixed timeclock total logged-in time +# 81210-1634 - Added server recording display options # header ("Content-type: text/html; charset=utf-8"); @@ -503,6 +504,30 @@ echo "
# LEAD2) + { + $URLserver_ip = $location; + $URLserver_ip = eregi_replace('http://','',$URLserver_ip); + $URLserver_ip = eregi_replace('https://','',$URLserver_ip); + $URLserver_ip = eregi_replace("\/.*",'',$URLserver_ip); + $stmt="select count(*) from servers where server_ip='$URLserver_ip';"; + $rsltx=mysql_query($stmt, $link); + $rowx=mysql_fetch_row($rsltx); + + if ($rowx[0] > 0) + { + $stmt="select recording_web_link,alt_server_ip from servers where server_ip='$URLserver_ip';"; + $rsltx=mysql_query($stmt, $link); + $rowx=mysql_fetch_row($rsltx); + + if (eregi("ALT_IP",$rowx[0])) + { + $location = eregi_replace($URLserver_ip, $rowx[1], $location); + } + } + } + if (strlen($location)>30) {$locat = substr($location,0,27); $locat = "$locat...";} else