From f8148df95ac471ef523be9b8b86e0ce9a7e6826d Mon Sep 17 00:00:00 2001 From: mattf Date: Mon, 22 Mar 2010 00:51:26 +0000 Subject: [PATCH] updated translations set version for 2.2.0rc7 git-svn-id: svn://192.168.202.10@1382 3d104415-ff17-0410-8863-d5cf3c621b8a --- .../agc_2.2.0/LANG_www/agc_br/dbconnect.php | 71 ++-- .../agc_2.2.0/LANG_www/agc_br/vicidial.php | 23 +- .../agc_2.2.0/LANG_www/agc_de/dbconnect.php | 71 ++-- .../agc_2.2.0/LANG_www/agc_de/vicidial.php | 23 +- .../agc_2.2.0/LANG_www/agc_el/dbconnect.php | 71 ++-- .../agc_2.2.0/LANG_www/agc_el/vicidial.php | 23 +- .../agc_2.2.0/LANG_www/agc_es/dbconnect.php | 71 ++-- .../agc_2.2.0/LANG_www/agc_es/vicidial.php | 23 +- .../agc_2.2.0/LANG_www/agc_fr/dbconnect.php | 71 ++-- .../agc_2.2.0/LANG_www/agc_fr/vicidial.php | 23 +- .../agc_2.2.0/LANG_www/agc_it/dbconnect.php | 71 ++-- .../agc_2.2.0/LANG_www/agc_it/vicidial.php | 23 +- .../agc_2.2.0/LANG_www/agc_nl/dbconnect.php | 71 ++-- .../agc_2.2.0/LANG_www/agc_nl/vicidial.php | 23 +- .../agc_2.2.0/LANG_www/agc_pl/dbconnect.php | 71 ++-- .../agc_2.2.0/LANG_www/agc_pl/vicidial.php | 23 +- .../agc_2.2.0/LANG_www/agc_pt/dbconnect.php | 71 ++-- .../agc_2.2.0/LANG_www/agc_pt/vicidial.php | 23 +- .../agc_2.2.0/LANG_www/agc_ru/dbconnect.php | 71 ++-- .../agc_2.2.0/LANG_www/agc_ru/vicidial.php | 23 +- .../agc_2.2.0/LANG_www/agc_sk/dbconnect.php | 71 ++-- .../agc_2.2.0/LANG_www/agc_sk/vicidial.php | 23 +- .../agc_2.2.0/LANG_www/agc_tw/dbconnect.php | 71 ++-- .../agc_2.2.0/LANG_www/agc_tw/vicidial.php | 23 +- .../vicidial_de/AST_agent_status_detail.php | 2 +- .../vicidial_de/AST_timeonVDADall.php | 317 +++++++++++++++--- .../agc_2.2.0/LANG_www/vicidial_de/admin.php | 25 +- .../LANG_www/vicidial_de/dbconnect.php | 71 ++-- .../vicidial_de/new_listloader_superL.php | 2 +- .../vicidial_el/AST_agent_status_detail.php | 2 +- .../vicidial_el/AST_timeonVDADall.php | 317 +++++++++++++++--- .../agc_2.2.0/LANG_www/vicidial_el/admin.php | 25 +- .../LANG_www/vicidial_el/dbconnect.php | 71 ++-- .../vicidial_el/new_listloader_superL.php | 2 +- .../vicidial_es/AST_agent_status_detail.php | 2 +- .../vicidial_es/AST_timeonVDADall.php | 317 +++++++++++++++--- .../agc_2.2.0/LANG_www/vicidial_es/admin.php | 25 +- .../LANG_www/vicidial_es/dbconnect.php | 71 ++-- .../vicidial_es/new_listloader_superL.php | 2 +- .../vicidial_fr/AST_agent_status_detail.php | 2 +- .../vicidial_fr/AST_timeonVDADall.php | 317 +++++++++++++++--- .../agc_2.2.0/LANG_www/vicidial_fr/admin.php | 25 +- .../LANG_www/vicidial_fr/dbconnect.php | 71 ++-- .../vicidial_fr/new_listloader_superL.php | 2 +- .../vicidial_it/AST_agent_status_detail.php | 2 +- .../vicidial_it/AST_timeonVDADall.php | 317 +++++++++++++++--- .../agc_2.2.0/LANG_www/vicidial_it/admin.php | 25 +- .../LANG_www/vicidial_it/dbconnect.php | 71 ++-- .../vicidial_it/new_listloader_superL.php | 2 +- .../extras/MySQL_AST_CREATE_tables.sql | 2 +- .../agc_2.2.0/extras/upgrade_2.2.0.sql | 2 +- agc_2-X/branches/agc_2.2.0/version | 2 +- 52 files changed, 2216 insertions(+), 1003 deletions(-) diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/dbconnect.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/dbconnect.php index 89d88689..e02ca392 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/dbconnect.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/dbconnect.php @@ -4,46 +4,49 @@ # # database connection settings and some global web settings # -# Copyright (C) 2009 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # if ( file_exists("/etc/astguiclient.conf") ) -{ -$DBCagc = file("/etc/astguiclient.conf"); -foreach ($DBCagc as $DBCline) { - $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); - if (ereg("^PATHlogs", $DBCline)) - {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} - if (ereg("^PATHweb", $DBCline)) - {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} - if (ereg("^VARDB_server", $DBCline)) - {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} - if (ereg("^VARDB_database", $DBCline)) - {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} - if (ereg("^VARDB_user", $DBCline)) - {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} - if (ereg("^VARDB_pass", $DBCline)) - {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} - if (ereg("^VARDB_port", $DBCline)) - {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + $DBCagc = file("/etc/astguiclient.conf"); + foreach ($DBCagc as $DBCline) + { + $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); + if (ereg("^PATHlogs", $DBCline)) + {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} + if (ereg("^PATHweb", $DBCline)) + {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} + if (ereg("^VARserver_ip", $DBCline)) + {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} + if (ereg("^VARDB_server", $DBCline)) + {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} + if (ereg("^VARDB_database", $DBCline)) + {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} + if (ereg("^VARDB_user", $DBCline)) + {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} + if (ereg("^VARDB_pass", $DBCline)) + {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} + if (ereg("^VARDB_port", $DBCline)) + {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + } + } +else + { + #defaults for DB connection + $VARDB_server = 'localhost'; + $VARDB_port = '3306'; + $VARDB_user = 'cron'; + $VARDB_pass = '1234'; + $VARDB_database = '1234'; + $WeBServeRRooT = '/usr/local/apache2/htdocs'; } -} -else -{ -#defaults for DB connection -$VARDB_server = 'localhost'; -$VARDB_user = 'cron'; -$VARDB_pass = '1234'; -$VARDB_database = '1234'; -$WeBServeRRooT = '/usr/local/apache2/htdocs'; -} - -$link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass"); -if (!$link) { +$link=mysql_connect("$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass"); +if (!$link) + { die('MySQL connect ERROR: ' . mysql_error()); -} -mysql_select_db("$VARDB_database",$link); + } +mysql_select_db("$VARDB_database"); $local_DEF = 'Local/'; $conf_silent_prefix = '7'; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vicidial.php index e3329e61..19a6231a 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vicidial.php @@ -276,10 +276,12 @@ # 100207-1109 - Changed Pause Codes function to allow for multiple pause codes per pause period # 100228-1257 - Fixed no-selected default transfer group issue on inbound calls # 100301-1329 - Changed AGENTDIRECT user selection launching to AGENTS link next to number-to-dial field +# 100309-1709 - small fix for IE CRM popup +# 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # -$version = '2.2.0-254'; -$build = '100301-1329'; +$version = '2.2.0-256'; +$build = '100315-1149'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -2749,6 +2751,8 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var timer_action_message=''; var timer_action_seconds=''; var pause_code_counter=1; + var last_uniqueid=''; + var tmp_vicidial_id=''; var DiaLControl_auto_HTML = "\"\"Início\""; var DiaLControl_auto_HTML_ready = "\"\"Início\""; var DiaLControl_auto_HTML_OFF = "\"\"Início\""; @@ -3692,11 +3696,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (inOUT == 'OUT') { - var tmp_vicidial_id = document.vicidial_form.uniqueid.value; + tmp_vicidial_id = document.vicidial_form.uniqueid.value; } else { - var tmp_vicidial_id = 'IN'; + tmp_vicidial_id = 'IN'; } var xmlhttp=false; /*@cc_on @*/ @@ -4658,6 +4662,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} custchannellive=1; document.vicidial_form.uniqueid.value = MDlookResponse_array[0]; + last_uniqueid = MDlookResponse_array[0]; document.vicidial_form.callchannel.value = MDlookResponse_array[1]; lastcustchannel = MDlookResponse_array[1]; if( document.images ) { document.images['livecall'].src = image_livecall_ON.src;} @@ -6434,6 +6439,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.vicidial_form.lead_id.value = VDIC_data_VDAC[0]; document.vicidial_form.uniqueid.value = VDIC_data_VDAC[1]; + last_uniqueid = VDIC_data_VDAC[1]; CIDcheck = VDIC_data_VDAC[2]; CalLCID = VDIC_data_VDAC[2]; document.vicidial_form.callchannel.value = VDIC_data_VDAC[3]; @@ -7968,7 +7974,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&comments=" + CallBackCommenTs; + DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&uniqueid=" + last_uniqueid + "&comments=" + CallBackCommenTs; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(DSupdate_query); @@ -8027,6 +8033,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} vtiger_callback_id='0'; recording_filename=''; recording_id=''; + document.vicidial_form.uniqueid.value=''; + MDuniqueid=''; + XDuniqueid=''; + tmp_vicidial_id=''; if (manual_dial_in_progress==1) { @@ -9900,7 +9910,8 @@ else var TEMP_crm_login_address = decoded; TEMP_crm_login_address = TEMP_crm_login_address.replace(regWFAcustom, ''); - CRMwin = window.open(TEMP_crm_login_address, 'CRMwin,toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); + var CRMwin = 'CRMwin'; + CRMwin = window.open(TEMP_crm_login_address, CRMwin,'toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); CRMwin.blur(); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/dbconnect.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/dbconnect.php index 89d88689..e02ca392 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/dbconnect.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/dbconnect.php @@ -4,46 +4,49 @@ # # database connection settings and some global web settings # -# Copyright (C) 2009 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # if ( file_exists("/etc/astguiclient.conf") ) -{ -$DBCagc = file("/etc/astguiclient.conf"); -foreach ($DBCagc as $DBCline) { - $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); - if (ereg("^PATHlogs", $DBCline)) - {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} - if (ereg("^PATHweb", $DBCline)) - {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} - if (ereg("^VARDB_server", $DBCline)) - {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} - if (ereg("^VARDB_database", $DBCline)) - {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} - if (ereg("^VARDB_user", $DBCline)) - {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} - if (ereg("^VARDB_pass", $DBCline)) - {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} - if (ereg("^VARDB_port", $DBCline)) - {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + $DBCagc = file("/etc/astguiclient.conf"); + foreach ($DBCagc as $DBCline) + { + $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); + if (ereg("^PATHlogs", $DBCline)) + {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} + if (ereg("^PATHweb", $DBCline)) + {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} + if (ereg("^VARserver_ip", $DBCline)) + {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} + if (ereg("^VARDB_server", $DBCline)) + {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} + if (ereg("^VARDB_database", $DBCline)) + {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} + if (ereg("^VARDB_user", $DBCline)) + {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} + if (ereg("^VARDB_pass", $DBCline)) + {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} + if (ereg("^VARDB_port", $DBCline)) + {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + } + } +else + { + #defaults for DB connection + $VARDB_server = 'localhost'; + $VARDB_port = '3306'; + $VARDB_user = 'cron'; + $VARDB_pass = '1234'; + $VARDB_database = '1234'; + $WeBServeRRooT = '/usr/local/apache2/htdocs'; } -} -else -{ -#defaults for DB connection -$VARDB_server = 'localhost'; -$VARDB_user = 'cron'; -$VARDB_pass = '1234'; -$VARDB_database = '1234'; -$WeBServeRRooT = '/usr/local/apache2/htdocs'; -} - -$link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass"); -if (!$link) { +$link=mysql_connect("$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass"); +if (!$link) + { die('MySQL connect ERROR: ' . mysql_error()); -} -mysql_select_db("$VARDB_database",$link); + } +mysql_select_db("$VARDB_database"); $local_DEF = 'Local/'; $conf_silent_prefix = '7'; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vicidial.php index c8742bb3..49b75dc4 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vicidial.php @@ -276,10 +276,12 @@ # 100207-1109 - Changed Pause Codes function to allow for multiple pause codes per pause period # 100228-1257 - Fixed no-selected default transfer group issue on inbound calls # 100301-1329 - Changed AGENTDIRECT user selection launching to AGENTS link next to number-to-dial field +# 100309-1709 - small fix for IE CRM popup +# 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # -$version = '2.2.0-254'; -$build = '100301-1329'; +$version = '2.2.0-256'; +$build = '100315-1149'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -2749,6 +2751,8 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var timer_action_message=''; var timer_action_seconds=''; var pause_code_counter=1; + var last_uniqueid=''; + var tmp_vicidial_id=''; var DiaLControl_auto_HTML = "\"\"WiederAufnehmen\""; var DiaLControl_auto_HTML_ready = "\"\"WiederAufnehmen\""; var DiaLControl_auto_HTML_OFF = "\"\"WiederAufnehmen\""; @@ -3692,11 +3696,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (inOUT == 'OUT') { - var tmp_vicidial_id = document.vicidial_form.uniqueid.value; + tmp_vicidial_id = document.vicidial_form.uniqueid.value; } else { - var tmp_vicidial_id = 'IN'; + tmp_vicidial_id = 'IN'; } var xmlhttp=false; /*@cc_on @*/ @@ -4658,6 +4662,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} custchannellive=1; document.vicidial_form.uniqueid.value = MDlookResponse_array[0]; + last_uniqueid = MDlookResponse_array[0]; document.vicidial_form.callchannel.value = MDlookResponse_array[1]; lastcustchannel = MDlookResponse_array[1]; if( document.images ) { document.images['livecall'].src = image_livecall_ON.src;} @@ -6434,6 +6439,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.vicidial_form.lead_id.value = VDIC_data_VDAC[0]; document.vicidial_form.uniqueid.value = VDIC_data_VDAC[1]; + last_uniqueid = VDIC_data_VDAC[1]; CIDcheck = VDIC_data_VDAC[2]; CalLCID = VDIC_data_VDAC[2]; document.vicidial_form.callchannel.value = VDIC_data_VDAC[3]; @@ -7968,7 +7974,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&comments=" + CallBackCommenTs; + DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&uniqueid=" + last_uniqueid + "&comments=" + CallBackCommenTs; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(DSupdate_query); @@ -8027,6 +8033,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} vtiger_callback_id='0'; recording_filename=''; recording_id=''; + document.vicidial_form.uniqueid.value=''; + MDuniqueid=''; + XDuniqueid=''; + tmp_vicidial_id=''; if (manual_dial_in_progress==1) { @@ -9900,7 +9910,8 @@ else var TEMP_crm_login_address = decoded; TEMP_crm_login_address = TEMP_crm_login_address.replace(regWFAcustom, ''); - CRMwin = window.open(TEMP_crm_login_address, 'CRMwin,toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); + var CRMwin = 'CRMwin'; + CRMwin = window.open(TEMP_crm_login_address, CRMwin,'toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); CRMwin.blur(); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/dbconnect.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/dbconnect.php index 89d88689..e02ca392 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/dbconnect.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/dbconnect.php @@ -4,46 +4,49 @@ # # database connection settings and some global web settings # -# Copyright (C) 2009 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # if ( file_exists("/etc/astguiclient.conf") ) -{ -$DBCagc = file("/etc/astguiclient.conf"); -foreach ($DBCagc as $DBCline) { - $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); - if (ereg("^PATHlogs", $DBCline)) - {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} - if (ereg("^PATHweb", $DBCline)) - {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} - if (ereg("^VARDB_server", $DBCline)) - {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} - if (ereg("^VARDB_database", $DBCline)) - {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} - if (ereg("^VARDB_user", $DBCline)) - {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} - if (ereg("^VARDB_pass", $DBCline)) - {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} - if (ereg("^VARDB_port", $DBCline)) - {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + $DBCagc = file("/etc/astguiclient.conf"); + foreach ($DBCagc as $DBCline) + { + $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); + if (ereg("^PATHlogs", $DBCline)) + {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} + if (ereg("^PATHweb", $DBCline)) + {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} + if (ereg("^VARserver_ip", $DBCline)) + {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} + if (ereg("^VARDB_server", $DBCline)) + {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} + if (ereg("^VARDB_database", $DBCline)) + {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} + if (ereg("^VARDB_user", $DBCline)) + {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} + if (ereg("^VARDB_pass", $DBCline)) + {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} + if (ereg("^VARDB_port", $DBCline)) + {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + } + } +else + { + #defaults for DB connection + $VARDB_server = 'localhost'; + $VARDB_port = '3306'; + $VARDB_user = 'cron'; + $VARDB_pass = '1234'; + $VARDB_database = '1234'; + $WeBServeRRooT = '/usr/local/apache2/htdocs'; } -} -else -{ -#defaults for DB connection -$VARDB_server = 'localhost'; -$VARDB_user = 'cron'; -$VARDB_pass = '1234'; -$VARDB_database = '1234'; -$WeBServeRRooT = '/usr/local/apache2/htdocs'; -} - -$link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass"); -if (!$link) { +$link=mysql_connect("$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass"); +if (!$link) + { die('MySQL connect ERROR: ' . mysql_error()); -} -mysql_select_db("$VARDB_database",$link); + } +mysql_select_db("$VARDB_database"); $local_DEF = 'Local/'; $conf_silent_prefix = '7'; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vicidial.php index f70bb02e..424b5848 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vicidial.php @@ -276,10 +276,12 @@ # 100207-1109 - Changed Pause Codes function to allow for multiple pause codes per pause period # 100228-1257 - Fixed no-selected default transfer group issue on inbound calls # 100301-1329 - Changed AGENTDIRECT user selection launching to AGENTS link next to number-to-dial field +# 100309-1709 - small fix for IE CRM popup +# 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # -$version = '2.2.0-254'; -$build = '100301-1329'; +$version = '2.2.0-256'; +$build = '100315-1149'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -2749,6 +2751,8 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var timer_action_message=''; var timer_action_seconds=''; var pause_code_counter=1; + var last_uniqueid=''; + var tmp_vicidial_id=''; var DiaLControl_auto_HTML = "\"\"Επανάληψη\""; var DiaLControl_auto_HTML_ready = "\"\"Επανάληψη\""; var DiaLControl_auto_HTML_OFF = "\"\"Επανάληψη\""; @@ -3692,11 +3696,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (inOUT == 'OUT') { - var tmp_vicidial_id = document.vicidial_form.uniqueid.value; + tmp_vicidial_id = document.vicidial_form.uniqueid.value; } else { - var tmp_vicidial_id = 'IN'; + tmp_vicidial_id = 'IN'; } var xmlhttp=false; /*@cc_on @*/ @@ -4658,6 +4662,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} custchannellive=1; document.vicidial_form.uniqueid.value = MDlookResponse_array[0]; + last_uniqueid = MDlookResponse_array[0]; document.vicidial_form.callchannel.value = MDlookResponse_array[1]; lastcustchannel = MDlookResponse_array[1]; if( document.images ) { document.images['livecall'].src = image_livecall_ON.src;} @@ -6434,6 +6439,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.vicidial_form.lead_id.value = VDIC_data_VDAC[0]; document.vicidial_form.uniqueid.value = VDIC_data_VDAC[1]; + last_uniqueid = VDIC_data_VDAC[1]; CIDcheck = VDIC_data_VDAC[2]; CalLCID = VDIC_data_VDAC[2]; document.vicidial_form.callchannel.value = VDIC_data_VDAC[3]; @@ -7968,7 +7974,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&comments=" + CallBackCommenTs; + DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&uniqueid=" + last_uniqueid + "&comments=" + CallBackCommenTs; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(DSupdate_query); @@ -8027,6 +8033,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} vtiger_callback_id='0'; recording_filename=''; recording_id=''; + document.vicidial_form.uniqueid.value=''; + MDuniqueid=''; + XDuniqueid=''; + tmp_vicidial_id=''; if (manual_dial_in_progress==1) { @@ -9900,7 +9910,8 @@ else var TEMP_crm_login_address = decoded; TEMP_crm_login_address = TEMP_crm_login_address.replace(regWFAcustom, ''); - CRMwin = window.open(TEMP_crm_login_address, 'CRMwin,toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); + var CRMwin = 'CRMwin'; + CRMwin = window.open(TEMP_crm_login_address, CRMwin,'toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); CRMwin.blur(); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/dbconnect.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/dbconnect.php index 89d88689..e02ca392 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/dbconnect.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/dbconnect.php @@ -4,46 +4,49 @@ # # database connection settings and some global web settings # -# Copyright (C) 2009 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # if ( file_exists("/etc/astguiclient.conf") ) -{ -$DBCagc = file("/etc/astguiclient.conf"); -foreach ($DBCagc as $DBCline) { - $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); - if (ereg("^PATHlogs", $DBCline)) - {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} - if (ereg("^PATHweb", $DBCline)) - {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} - if (ereg("^VARDB_server", $DBCline)) - {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} - if (ereg("^VARDB_database", $DBCline)) - {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} - if (ereg("^VARDB_user", $DBCline)) - {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} - if (ereg("^VARDB_pass", $DBCline)) - {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} - if (ereg("^VARDB_port", $DBCline)) - {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + $DBCagc = file("/etc/astguiclient.conf"); + foreach ($DBCagc as $DBCline) + { + $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); + if (ereg("^PATHlogs", $DBCline)) + {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} + if (ereg("^PATHweb", $DBCline)) + {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} + if (ereg("^VARserver_ip", $DBCline)) + {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} + if (ereg("^VARDB_server", $DBCline)) + {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} + if (ereg("^VARDB_database", $DBCline)) + {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} + if (ereg("^VARDB_user", $DBCline)) + {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} + if (ereg("^VARDB_pass", $DBCline)) + {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} + if (ereg("^VARDB_port", $DBCline)) + {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + } + } +else + { + #defaults for DB connection + $VARDB_server = 'localhost'; + $VARDB_port = '3306'; + $VARDB_user = 'cron'; + $VARDB_pass = '1234'; + $VARDB_database = '1234'; + $WeBServeRRooT = '/usr/local/apache2/htdocs'; } -} -else -{ -#defaults for DB connection -$VARDB_server = 'localhost'; -$VARDB_user = 'cron'; -$VARDB_pass = '1234'; -$VARDB_database = '1234'; -$WeBServeRRooT = '/usr/local/apache2/htdocs'; -} - -$link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass"); -if (!$link) { +$link=mysql_connect("$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass"); +if (!$link) + { die('MySQL connect ERROR: ' . mysql_error()); -} -mysql_select_db("$VARDB_database",$link); + } +mysql_select_db("$VARDB_database"); $local_DEF = 'Local/'; $conf_silent_prefix = '7'; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vicidial.php index 7026bea2..f3eb4b52 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vicidial.php @@ -276,10 +276,12 @@ # 100207-1109 - Changed Pause Codes function to allow for multiple pause codes per pause period # 100228-1257 - Fixed no-selected default transfer group issue on inbound calls # 100301-1329 - Changed AGENTDIRECT user selection launching to AGENTS link next to number-to-dial field +# 100309-1709 - small fix for IE CRM popup +# 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # -$version = '2.2.0-254'; -$build = '100301-1329'; +$version = '2.2.0-256'; +$build = '100315-1149'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -2749,6 +2751,8 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var timer_action_message=''; var timer_action_seconds=''; var pause_code_counter=1; + var last_uniqueid=''; + var tmp_vicidial_id=''; var DiaLControl_auto_HTML = "\"\"Comienzo\""; var DiaLControl_auto_HTML_ready = "\"\"Comienzo\""; var DiaLControl_auto_HTML_OFF = "\"\"Comienzo\""; @@ -3692,11 +3696,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (inOUT == 'OUT') { - var tmp_vicidial_id = document.vicidial_form.uniqueid.value; + tmp_vicidial_id = document.vicidial_form.uniqueid.value; } else { - var tmp_vicidial_id = 'IN'; + tmp_vicidial_id = 'IN'; } var xmlhttp=false; /*@cc_on @*/ @@ -4658,6 +4662,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} custchannellive=1; document.vicidial_form.uniqueid.value = MDlookResponse_array[0]; + last_uniqueid = MDlookResponse_array[0]; document.vicidial_form.callchannel.value = MDlookResponse_array[1]; lastcustchannel = MDlookResponse_array[1]; if( document.images ) { document.images['livecall'].src = image_livecall_ON.src;} @@ -6434,6 +6439,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.vicidial_form.lead_id.value = VDIC_data_VDAC[0]; document.vicidial_form.uniqueid.value = VDIC_data_VDAC[1]; + last_uniqueid = VDIC_data_VDAC[1]; CIDcheck = VDIC_data_VDAC[2]; CalLCID = VDIC_data_VDAC[2]; document.vicidial_form.callchannel.value = VDIC_data_VDAC[3]; @@ -7968,7 +7974,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&comments=" + CallBackCommenTs; + DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&uniqueid=" + last_uniqueid + "&comments=" + CallBackCommenTs; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(DSupdate_query); @@ -8027,6 +8033,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} vtiger_callback_id='0'; recording_filename=''; recording_id=''; + document.vicidial_form.uniqueid.value=''; + MDuniqueid=''; + XDuniqueid=''; + tmp_vicidial_id=''; if (manual_dial_in_progress==1) { @@ -9900,7 +9910,8 @@ else var TEMP_crm_login_address = decoded; TEMP_crm_login_address = TEMP_crm_login_address.replace(regWFAcustom, ''); - CRMwin = window.open(TEMP_crm_login_address, 'CRMwin,toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); + var CRMwin = 'CRMwin'; + CRMwin = window.open(TEMP_crm_login_address, CRMwin,'toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); CRMwin.blur(); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/dbconnect.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/dbconnect.php index 89d88689..e02ca392 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/dbconnect.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/dbconnect.php @@ -4,46 +4,49 @@ # # database connection settings and some global web settings # -# Copyright (C) 2009 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # if ( file_exists("/etc/astguiclient.conf") ) -{ -$DBCagc = file("/etc/astguiclient.conf"); -foreach ($DBCagc as $DBCline) { - $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); - if (ereg("^PATHlogs", $DBCline)) - {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} - if (ereg("^PATHweb", $DBCline)) - {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} - if (ereg("^VARDB_server", $DBCline)) - {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} - if (ereg("^VARDB_database", $DBCline)) - {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} - if (ereg("^VARDB_user", $DBCline)) - {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} - if (ereg("^VARDB_pass", $DBCline)) - {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} - if (ereg("^VARDB_port", $DBCline)) - {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + $DBCagc = file("/etc/astguiclient.conf"); + foreach ($DBCagc as $DBCline) + { + $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); + if (ereg("^PATHlogs", $DBCline)) + {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} + if (ereg("^PATHweb", $DBCline)) + {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} + if (ereg("^VARserver_ip", $DBCline)) + {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} + if (ereg("^VARDB_server", $DBCline)) + {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} + if (ereg("^VARDB_database", $DBCline)) + {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} + if (ereg("^VARDB_user", $DBCline)) + {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} + if (ereg("^VARDB_pass", $DBCline)) + {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} + if (ereg("^VARDB_port", $DBCline)) + {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + } + } +else + { + #defaults for DB connection + $VARDB_server = 'localhost'; + $VARDB_port = '3306'; + $VARDB_user = 'cron'; + $VARDB_pass = '1234'; + $VARDB_database = '1234'; + $WeBServeRRooT = '/usr/local/apache2/htdocs'; } -} -else -{ -#defaults for DB connection -$VARDB_server = 'localhost'; -$VARDB_user = 'cron'; -$VARDB_pass = '1234'; -$VARDB_database = '1234'; -$WeBServeRRooT = '/usr/local/apache2/htdocs'; -} - -$link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass"); -if (!$link) { +$link=mysql_connect("$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass"); +if (!$link) + { die('MySQL connect ERROR: ' . mysql_error()); -} -mysql_select_db("$VARDB_database",$link); + } +mysql_select_db("$VARDB_database"); $local_DEF = 'Local/'; $conf_silent_prefix = '7'; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vicidial.php index 61e9babf..c390bc96 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vicidial.php @@ -276,10 +276,12 @@ # 100207-1109 - Changed Pause Codes function to allow for multiple pause codes per pause period # 100228-1257 - Fixed no-selected default transfer group issue on inbound calls # 100301-1329 - Changed AGENTDIRECT user selection launching to AGENTS link next to number-to-dial field +# 100309-1709 - small fix for IE CRM popup +# 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # -$version = '2.2.0-254'; -$build = '100301-1329'; +$version = '2.2.0-256'; +$build = '100315-1149'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -2749,6 +2751,8 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var timer_action_message=''; var timer_action_seconds=''; var pause_code_counter=1; + var last_uniqueid=''; + var tmp_vicidial_id=''; var DiaLControl_auto_HTML = "\"\"Résumé\""; var DiaLControl_auto_HTML_ready = "\"\"Résumé\""; var DiaLControl_auto_HTML_OFF = "\"\"Résumé\""; @@ -3692,11 +3696,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (inOUT == 'OUT') { - var tmp_vicidial_id = document.vicidial_form.uniqueid.value; + tmp_vicidial_id = document.vicidial_form.uniqueid.value; } else { - var tmp_vicidial_id = 'IN'; + tmp_vicidial_id = 'IN'; } var xmlhttp=false; /*@cc_on @*/ @@ -4658,6 +4662,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} custchannellive=1; document.vicidial_form.uniqueid.value = MDlookResponse_array[0]; + last_uniqueid = MDlookResponse_array[0]; document.vicidial_form.callchannel.value = MDlookResponse_array[1]; lastcustchannel = MDlookResponse_array[1]; if( document.images ) { document.images['livecall'].src = image_livecall_ON.src;} @@ -6434,6 +6439,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.vicidial_form.lead_id.value = VDIC_data_VDAC[0]; document.vicidial_form.uniqueid.value = VDIC_data_VDAC[1]; + last_uniqueid = VDIC_data_VDAC[1]; CIDcheck = VDIC_data_VDAC[2]; CalLCID = VDIC_data_VDAC[2]; document.vicidial_form.callchannel.value = VDIC_data_VDAC[3]; @@ -7968,7 +7974,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&comments=" + CallBackCommenTs; + DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&uniqueid=" + last_uniqueid + "&comments=" + CallBackCommenTs; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(DSupdate_query); @@ -8027,6 +8033,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} vtiger_callback_id='0'; recording_filename=''; recording_id=''; + document.vicidial_form.uniqueid.value=''; + MDuniqueid=''; + XDuniqueid=''; + tmp_vicidial_id=''; if (manual_dial_in_progress==1) { @@ -9900,7 +9910,8 @@ else var TEMP_crm_login_address = decoded; TEMP_crm_login_address = TEMP_crm_login_address.replace(regWFAcustom, ''); - CRMwin = window.open(TEMP_crm_login_address, 'CRMwin,toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); + var CRMwin = 'CRMwin'; + CRMwin = window.open(TEMP_crm_login_address, CRMwin,'toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); CRMwin.blur(); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/dbconnect.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/dbconnect.php index 89d88689..e02ca392 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/dbconnect.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/dbconnect.php @@ -4,46 +4,49 @@ # # database connection settings and some global web settings # -# Copyright (C) 2009 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # if ( file_exists("/etc/astguiclient.conf") ) -{ -$DBCagc = file("/etc/astguiclient.conf"); -foreach ($DBCagc as $DBCline) { - $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); - if (ereg("^PATHlogs", $DBCline)) - {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} - if (ereg("^PATHweb", $DBCline)) - {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} - if (ereg("^VARDB_server", $DBCline)) - {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} - if (ereg("^VARDB_database", $DBCline)) - {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} - if (ereg("^VARDB_user", $DBCline)) - {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} - if (ereg("^VARDB_pass", $DBCline)) - {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} - if (ereg("^VARDB_port", $DBCline)) - {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + $DBCagc = file("/etc/astguiclient.conf"); + foreach ($DBCagc as $DBCline) + { + $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); + if (ereg("^PATHlogs", $DBCline)) + {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} + if (ereg("^PATHweb", $DBCline)) + {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} + if (ereg("^VARserver_ip", $DBCline)) + {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} + if (ereg("^VARDB_server", $DBCline)) + {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} + if (ereg("^VARDB_database", $DBCline)) + {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} + if (ereg("^VARDB_user", $DBCline)) + {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} + if (ereg("^VARDB_pass", $DBCline)) + {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} + if (ereg("^VARDB_port", $DBCline)) + {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + } + } +else + { + #defaults for DB connection + $VARDB_server = 'localhost'; + $VARDB_port = '3306'; + $VARDB_user = 'cron'; + $VARDB_pass = '1234'; + $VARDB_database = '1234'; + $WeBServeRRooT = '/usr/local/apache2/htdocs'; } -} -else -{ -#defaults for DB connection -$VARDB_server = 'localhost'; -$VARDB_user = 'cron'; -$VARDB_pass = '1234'; -$VARDB_database = '1234'; -$WeBServeRRooT = '/usr/local/apache2/htdocs'; -} - -$link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass"); -if (!$link) { +$link=mysql_connect("$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass"); +if (!$link) + { die('MySQL connect ERROR: ' . mysql_error()); -} -mysql_select_db("$VARDB_database",$link); + } +mysql_select_db("$VARDB_database"); $local_DEF = 'Local/'; $conf_silent_prefix = '7'; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vicidial.php index 513df0db..d4f63d6d 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vicidial.php @@ -276,10 +276,12 @@ # 100207-1109 - Changed Pause Codes function to allow for multiple pause codes per pause period # 100228-1257 - Fixed no-selected default transfer group issue on inbound calls # 100301-1329 - Changed AGENTDIRECT user selection launching to AGENTS link next to number-to-dial field +# 100309-1709 - small fix for IE CRM popup +# 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # -$version = '2.2.0-254'; -$build = '100301-1329'; +$version = '2.2.0-256'; +$build = '100315-1149'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -2749,6 +2751,8 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var timer_action_message=''; var timer_action_seconds=''; var pause_code_counter=1; + var last_uniqueid=''; + var tmp_vicidial_id=''; var DiaLControl_auto_HTML = "\"\"Riprendi\""; var DiaLControl_auto_HTML_ready = "\"\"Riprendi\""; var DiaLControl_auto_HTML_OFF = "\"\"Riprendi\""; @@ -3692,11 +3696,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (inOUT == 'OUT') { - var tmp_vicidial_id = document.vicidial_form.uniqueid.value; + tmp_vicidial_id = document.vicidial_form.uniqueid.value; } else { - var tmp_vicidial_id = 'IN'; + tmp_vicidial_id = 'IN'; } var xmlhttp=false; /*@cc_on @*/ @@ -4658,6 +4662,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} custchannellive=1; document.vicidial_form.uniqueid.value = MDlookResponse_array[0]; + last_uniqueid = MDlookResponse_array[0]; document.vicidial_form.callchannel.value = MDlookResponse_array[1]; lastcustchannel = MDlookResponse_array[1]; if( document.images ) { document.images['livecall'].src = image_livecall_ON.src;} @@ -6434,6 +6439,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.vicidial_form.lead_id.value = VDIC_data_VDAC[0]; document.vicidial_form.uniqueid.value = VDIC_data_VDAC[1]; + last_uniqueid = VDIC_data_VDAC[1]; CIDcheck = VDIC_data_VDAC[2]; CalLCID = VDIC_data_VDAC[2]; document.vicidial_form.callchannel.value = VDIC_data_VDAC[3]; @@ -7968,7 +7974,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&comments=" + CallBackCommenTs; + DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&uniqueid=" + last_uniqueid + "&comments=" + CallBackCommenTs; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(DSupdate_query); @@ -8027,6 +8033,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} vtiger_callback_id='0'; recording_filename=''; recording_id=''; + document.vicidial_form.uniqueid.value=''; + MDuniqueid=''; + XDuniqueid=''; + tmp_vicidial_id=''; if (manual_dial_in_progress==1) { @@ -9900,7 +9910,8 @@ else var TEMP_crm_login_address = decoded; TEMP_crm_login_address = TEMP_crm_login_address.replace(regWFAcustom, ''); - CRMwin = window.open(TEMP_crm_login_address, 'CRMwin,toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); + var CRMwin = 'CRMwin'; + CRMwin = window.open(TEMP_crm_login_address, CRMwin,'toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); CRMwin.blur(); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/dbconnect.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/dbconnect.php index 89d88689..e02ca392 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/dbconnect.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/dbconnect.php @@ -4,46 +4,49 @@ # # database connection settings and some global web settings # -# Copyright (C) 2009 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # if ( file_exists("/etc/astguiclient.conf") ) -{ -$DBCagc = file("/etc/astguiclient.conf"); -foreach ($DBCagc as $DBCline) { - $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); - if (ereg("^PATHlogs", $DBCline)) - {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} - if (ereg("^PATHweb", $DBCline)) - {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} - if (ereg("^VARDB_server", $DBCline)) - {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} - if (ereg("^VARDB_database", $DBCline)) - {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} - if (ereg("^VARDB_user", $DBCline)) - {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} - if (ereg("^VARDB_pass", $DBCline)) - {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} - if (ereg("^VARDB_port", $DBCline)) - {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + $DBCagc = file("/etc/astguiclient.conf"); + foreach ($DBCagc as $DBCline) + { + $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); + if (ereg("^PATHlogs", $DBCline)) + {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} + if (ereg("^PATHweb", $DBCline)) + {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} + if (ereg("^VARserver_ip", $DBCline)) + {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} + if (ereg("^VARDB_server", $DBCline)) + {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} + if (ereg("^VARDB_database", $DBCline)) + {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} + if (ereg("^VARDB_user", $DBCline)) + {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} + if (ereg("^VARDB_pass", $DBCline)) + {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} + if (ereg("^VARDB_port", $DBCline)) + {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + } + } +else + { + #defaults for DB connection + $VARDB_server = 'localhost'; + $VARDB_port = '3306'; + $VARDB_user = 'cron'; + $VARDB_pass = '1234'; + $VARDB_database = '1234'; + $WeBServeRRooT = '/usr/local/apache2/htdocs'; } -} -else -{ -#defaults for DB connection -$VARDB_server = 'localhost'; -$VARDB_user = 'cron'; -$VARDB_pass = '1234'; -$VARDB_database = '1234'; -$WeBServeRRooT = '/usr/local/apache2/htdocs'; -} - -$link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass"); -if (!$link) { +$link=mysql_connect("$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass"); +if (!$link) + { die('MySQL connect ERROR: ' . mysql_error()); -} -mysql_select_db("$VARDB_database",$link); + } +mysql_select_db("$VARDB_database"); $local_DEF = 'Local/'; $conf_silent_prefix = '7'; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vicidial.php index 6372ffdd..4f6934d5 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vicidial.php @@ -276,10 +276,12 @@ # 100207-1109 - Changed Pause Codes function to allow for multiple pause codes per pause period # 100228-1257 - Fixed no-selected default transfer group issue on inbound calls # 100301-1329 - Changed AGENTDIRECT user selection launching to AGENTS link next to number-to-dial field +# 100309-1709 - small fix for IE CRM popup +# 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # -$version = '2.2.0-254'; -$build = '100301-1329'; +$version = '2.2.0-256'; +$build = '100315-1149'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -2749,6 +2751,8 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var timer_action_message=''; var timer_action_seconds=''; var pause_code_counter=1; + var last_uniqueid=''; + var tmp_vicidial_id=''; var DiaLControl_auto_HTML = "\"\"Doorgaan\""; var DiaLControl_auto_HTML_ready = "\"\"Doorgaan\""; var DiaLControl_auto_HTML_OFF = "\"\"Doorgaan\""; @@ -3692,11 +3696,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (inOUT == 'OUT') { - var tmp_vicidial_id = document.vicidial_form.uniqueid.value; + tmp_vicidial_id = document.vicidial_form.uniqueid.value; } else { - var tmp_vicidial_id = 'IN'; + tmp_vicidial_id = 'IN'; } var xmlhttp=false; /*@cc_on @*/ @@ -4658,6 +4662,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} custchannellive=1; document.vicidial_form.uniqueid.value = MDlookResponse_array[0]; + last_uniqueid = MDlookResponse_array[0]; document.vicidial_form.callchannel.value = MDlookResponse_array[1]; lastcustchannel = MDlookResponse_array[1]; if( document.images ) { document.images['livecall'].src = image_livecall_ON.src;} @@ -6434,6 +6439,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.vicidial_form.lead_id.value = VDIC_data_VDAC[0]; document.vicidial_form.uniqueid.value = VDIC_data_VDAC[1]; + last_uniqueid = VDIC_data_VDAC[1]; CIDcheck = VDIC_data_VDAC[2]; CalLCID = VDIC_data_VDAC[2]; document.vicidial_form.callchannel.value = VDIC_data_VDAC[3]; @@ -7968,7 +7974,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&comments=" + CallBackCommenTs; + DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&uniqueid=" + last_uniqueid + "&comments=" + CallBackCommenTs; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(DSupdate_query); @@ -8027,6 +8033,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} vtiger_callback_id='0'; recording_filename=''; recording_id=''; + document.vicidial_form.uniqueid.value=''; + MDuniqueid=''; + XDuniqueid=''; + tmp_vicidial_id=''; if (manual_dial_in_progress==1) { @@ -9900,7 +9910,8 @@ else var TEMP_crm_login_address = decoded; TEMP_crm_login_address = TEMP_crm_login_address.replace(regWFAcustom, ''); - CRMwin = window.open(TEMP_crm_login_address, 'CRMwin,toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); + var CRMwin = 'CRMwin'; + CRMwin = window.open(TEMP_crm_login_address, CRMwin,'toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); CRMwin.blur(); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/dbconnect.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/dbconnect.php index 89d88689..e02ca392 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/dbconnect.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/dbconnect.php @@ -4,46 +4,49 @@ # # database connection settings and some global web settings # -# Copyright (C) 2009 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # if ( file_exists("/etc/astguiclient.conf") ) -{ -$DBCagc = file("/etc/astguiclient.conf"); -foreach ($DBCagc as $DBCline) { - $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); - if (ereg("^PATHlogs", $DBCline)) - {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} - if (ereg("^PATHweb", $DBCline)) - {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} - if (ereg("^VARDB_server", $DBCline)) - {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} - if (ereg("^VARDB_database", $DBCline)) - {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} - if (ereg("^VARDB_user", $DBCline)) - {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} - if (ereg("^VARDB_pass", $DBCline)) - {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} - if (ereg("^VARDB_port", $DBCline)) - {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + $DBCagc = file("/etc/astguiclient.conf"); + foreach ($DBCagc as $DBCline) + { + $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); + if (ereg("^PATHlogs", $DBCline)) + {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} + if (ereg("^PATHweb", $DBCline)) + {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} + if (ereg("^VARserver_ip", $DBCline)) + {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} + if (ereg("^VARDB_server", $DBCline)) + {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} + if (ereg("^VARDB_database", $DBCline)) + {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} + if (ereg("^VARDB_user", $DBCline)) + {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} + if (ereg("^VARDB_pass", $DBCline)) + {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} + if (ereg("^VARDB_port", $DBCline)) + {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + } + } +else + { + #defaults for DB connection + $VARDB_server = 'localhost'; + $VARDB_port = '3306'; + $VARDB_user = 'cron'; + $VARDB_pass = '1234'; + $VARDB_database = '1234'; + $WeBServeRRooT = '/usr/local/apache2/htdocs'; } -} -else -{ -#defaults for DB connection -$VARDB_server = 'localhost'; -$VARDB_user = 'cron'; -$VARDB_pass = '1234'; -$VARDB_database = '1234'; -$WeBServeRRooT = '/usr/local/apache2/htdocs'; -} - -$link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass"); -if (!$link) { +$link=mysql_connect("$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass"); +if (!$link) + { die('MySQL connect ERROR: ' . mysql_error()); -} -mysql_select_db("$VARDB_database",$link); + } +mysql_select_db("$VARDB_database"); $local_DEF = 'Local/'; $conf_silent_prefix = '7'; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vicidial.php index dd01aea8..7f086516 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vicidial.php @@ -276,10 +276,12 @@ # 100207-1109 - Changed Pause Codes function to allow for multiple pause codes per pause period # 100228-1257 - Fixed no-selected default transfer group issue on inbound calls # 100301-1329 - Changed AGENTDIRECT user selection launching to AGENTS link next to number-to-dial field +# 100309-1709 - small fix for IE CRM popup +# 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # -$version = '2.2.0-254'; -$build = '100301-1329'; +$version = '2.2.0-256'; +$build = '100315-1149'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -2749,6 +2751,8 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var timer_action_message=''; var timer_action_seconds=''; var pause_code_counter=1; + var last_uniqueid=''; + var tmp_vicidial_id=''; var DiaLControl_auto_HTML = "\"\"Ponów\""; var DiaLControl_auto_HTML_ready = "\"\"Ponów\""; var DiaLControl_auto_HTML_OFF = "\"\"Ponów\""; @@ -3692,11 +3696,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (inOUT == 'OUT') { - var tmp_vicidial_id = document.vicidial_form.uniqueid.value; + tmp_vicidial_id = document.vicidial_form.uniqueid.value; } else { - var tmp_vicidial_id = 'IN'; + tmp_vicidial_id = 'IN'; } var xmlhttp=false; /*@cc_on @*/ @@ -4658,6 +4662,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} custchannellive=1; document.vicidial_form.uniqueid.value = MDlookResponse_array[0]; + last_uniqueid = MDlookResponse_array[0]; document.vicidial_form.callchannel.value = MDlookResponse_array[1]; lastcustchannel = MDlookResponse_array[1]; if( document.images ) { document.images['livecall'].src = image_livecall_ON.src;} @@ -6434,6 +6439,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.vicidial_form.lead_id.value = VDIC_data_VDAC[0]; document.vicidial_form.uniqueid.value = VDIC_data_VDAC[1]; + last_uniqueid = VDIC_data_VDAC[1]; CIDcheck = VDIC_data_VDAC[2]; CalLCID = VDIC_data_VDAC[2]; document.vicidial_form.callchannel.value = VDIC_data_VDAC[3]; @@ -7968,7 +7974,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&comments=" + CallBackCommenTs; + DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&uniqueid=" + last_uniqueid + "&comments=" + CallBackCommenTs; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(DSupdate_query); @@ -8027,6 +8033,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} vtiger_callback_id='0'; recording_filename=''; recording_id=''; + document.vicidial_form.uniqueid.value=''; + MDuniqueid=''; + XDuniqueid=''; + tmp_vicidial_id=''; if (manual_dial_in_progress==1) { @@ -9900,7 +9910,8 @@ else var TEMP_crm_login_address = decoded; TEMP_crm_login_address = TEMP_crm_login_address.replace(regWFAcustom, ''); - CRMwin = window.open(TEMP_crm_login_address, 'CRMwin,toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); + var CRMwin = 'CRMwin'; + CRMwin = window.open(TEMP_crm_login_address, CRMwin,'toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); CRMwin.blur(); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/dbconnect.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/dbconnect.php index 89d88689..e02ca392 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/dbconnect.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/dbconnect.php @@ -4,46 +4,49 @@ # # database connection settings and some global web settings # -# Copyright (C) 2009 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # if ( file_exists("/etc/astguiclient.conf") ) -{ -$DBCagc = file("/etc/astguiclient.conf"); -foreach ($DBCagc as $DBCline) { - $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); - if (ereg("^PATHlogs", $DBCline)) - {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} - if (ereg("^PATHweb", $DBCline)) - {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} - if (ereg("^VARDB_server", $DBCline)) - {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} - if (ereg("^VARDB_database", $DBCline)) - {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} - if (ereg("^VARDB_user", $DBCline)) - {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} - if (ereg("^VARDB_pass", $DBCline)) - {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} - if (ereg("^VARDB_port", $DBCline)) - {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + $DBCagc = file("/etc/astguiclient.conf"); + foreach ($DBCagc as $DBCline) + { + $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); + if (ereg("^PATHlogs", $DBCline)) + {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} + if (ereg("^PATHweb", $DBCline)) + {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} + if (ereg("^VARserver_ip", $DBCline)) + {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} + if (ereg("^VARDB_server", $DBCline)) + {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} + if (ereg("^VARDB_database", $DBCline)) + {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} + if (ereg("^VARDB_user", $DBCline)) + {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} + if (ereg("^VARDB_pass", $DBCline)) + {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} + if (ereg("^VARDB_port", $DBCline)) + {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + } + } +else + { + #defaults for DB connection + $VARDB_server = 'localhost'; + $VARDB_port = '3306'; + $VARDB_user = 'cron'; + $VARDB_pass = '1234'; + $VARDB_database = '1234'; + $WeBServeRRooT = '/usr/local/apache2/htdocs'; } -} -else -{ -#defaults for DB connection -$VARDB_server = 'localhost'; -$VARDB_user = 'cron'; -$VARDB_pass = '1234'; -$VARDB_database = '1234'; -$WeBServeRRooT = '/usr/local/apache2/htdocs'; -} - -$link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass"); -if (!$link) { +$link=mysql_connect("$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass"); +if (!$link) + { die('MySQL connect ERROR: ' . mysql_error()); -} -mysql_select_db("$VARDB_database",$link); + } +mysql_select_db("$VARDB_database"); $local_DEF = 'Local/'; $conf_silent_prefix = '7'; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vicidial.php index 5f141e2c..863242f6 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vicidial.php @@ -276,10 +276,12 @@ # 100207-1109 - Changed Pause Codes function to allow for multiple pause codes per pause period # 100228-1257 - Fixed no-selected default transfer group issue on inbound calls # 100301-1329 - Changed AGENTDIRECT user selection launching to AGENTS link next to number-to-dial field +# 100309-1709 - small fix for IE CRM popup +# 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # -$version = '2.2.0-254'; -$build = '100301-1329'; +$version = '2.2.0-256'; +$build = '100315-1149'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -2749,6 +2751,8 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var timer_action_message=''; var timer_action_seconds=''; var pause_code_counter=1; + var last_uniqueid=''; + var tmp_vicidial_id=''; var DiaLControl_auto_HTML = "\"\"Resumo\""; var DiaLControl_auto_HTML_ready = "\"\"Resumo\""; var DiaLControl_auto_HTML_OFF = "\"\"Resumo\""; @@ -3692,11 +3696,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (inOUT == 'OUT') { - var tmp_vicidial_id = document.vicidial_form.uniqueid.value; + tmp_vicidial_id = document.vicidial_form.uniqueid.value; } else { - var tmp_vicidial_id = 'IN'; + tmp_vicidial_id = 'IN'; } var xmlhttp=false; /*@cc_on @*/ @@ -4658,6 +4662,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} custchannellive=1; document.vicidial_form.uniqueid.value = MDlookResponse_array[0]; + last_uniqueid = MDlookResponse_array[0]; document.vicidial_form.callchannel.value = MDlookResponse_array[1]; lastcustchannel = MDlookResponse_array[1]; if( document.images ) { document.images['livecall'].src = image_livecall_ON.src;} @@ -6434,6 +6439,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.vicidial_form.lead_id.value = VDIC_data_VDAC[0]; document.vicidial_form.uniqueid.value = VDIC_data_VDAC[1]; + last_uniqueid = VDIC_data_VDAC[1]; CIDcheck = VDIC_data_VDAC[2]; CalLCID = VDIC_data_VDAC[2]; document.vicidial_form.callchannel.value = VDIC_data_VDAC[3]; @@ -7968,7 +7974,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&comments=" + CallBackCommenTs; + DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&uniqueid=" + last_uniqueid + "&comments=" + CallBackCommenTs; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(DSupdate_query); @@ -8027,6 +8033,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} vtiger_callback_id='0'; recording_filename=''; recording_id=''; + document.vicidial_form.uniqueid.value=''; + MDuniqueid=''; + XDuniqueid=''; + tmp_vicidial_id=''; if (manual_dial_in_progress==1) { @@ -9900,7 +9910,8 @@ else var TEMP_crm_login_address = decoded; TEMP_crm_login_address = TEMP_crm_login_address.replace(regWFAcustom, ''); - CRMwin = window.open(TEMP_crm_login_address, 'CRMwin,toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); + var CRMwin = 'CRMwin'; + CRMwin = window.open(TEMP_crm_login_address, CRMwin,'toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); CRMwin.blur(); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/dbconnect.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/dbconnect.php index 89d88689..e02ca392 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/dbconnect.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/dbconnect.php @@ -4,46 +4,49 @@ # # database connection settings and some global web settings # -# Copyright (C) 2009 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # if ( file_exists("/etc/astguiclient.conf") ) -{ -$DBCagc = file("/etc/astguiclient.conf"); -foreach ($DBCagc as $DBCline) { - $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); - if (ereg("^PATHlogs", $DBCline)) - {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} - if (ereg("^PATHweb", $DBCline)) - {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} - if (ereg("^VARDB_server", $DBCline)) - {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} - if (ereg("^VARDB_database", $DBCline)) - {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} - if (ereg("^VARDB_user", $DBCline)) - {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} - if (ereg("^VARDB_pass", $DBCline)) - {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} - if (ereg("^VARDB_port", $DBCline)) - {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + $DBCagc = file("/etc/astguiclient.conf"); + foreach ($DBCagc as $DBCline) + { + $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); + if (ereg("^PATHlogs", $DBCline)) + {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} + if (ereg("^PATHweb", $DBCline)) + {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} + if (ereg("^VARserver_ip", $DBCline)) + {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} + if (ereg("^VARDB_server", $DBCline)) + {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} + if (ereg("^VARDB_database", $DBCline)) + {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} + if (ereg("^VARDB_user", $DBCline)) + {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} + if (ereg("^VARDB_pass", $DBCline)) + {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} + if (ereg("^VARDB_port", $DBCline)) + {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + } + } +else + { + #defaults for DB connection + $VARDB_server = 'localhost'; + $VARDB_port = '3306'; + $VARDB_user = 'cron'; + $VARDB_pass = '1234'; + $VARDB_database = '1234'; + $WeBServeRRooT = '/usr/local/apache2/htdocs'; } -} -else -{ -#defaults for DB connection -$VARDB_server = 'localhost'; -$VARDB_user = 'cron'; -$VARDB_pass = '1234'; -$VARDB_database = '1234'; -$WeBServeRRooT = '/usr/local/apache2/htdocs'; -} - -$link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass"); -if (!$link) { +$link=mysql_connect("$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass"); +if (!$link) + { die('MySQL connect ERROR: ' . mysql_error()); -} -mysql_select_db("$VARDB_database",$link); + } +mysql_select_db("$VARDB_database"); $local_DEF = 'Local/'; $conf_silent_prefix = '7'; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vicidial.php index 5259eeae..53a23b4d 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vicidial.php @@ -276,10 +276,12 @@ # 100207-1109 - Changed Pause Codes function to allow for multiple pause codes per pause period # 100228-1257 - Fixed no-selected default transfer group issue on inbound calls # 100301-1329 - Changed AGENTDIRECT user selection launching to AGENTS link next to number-to-dial field +# 100309-1709 - small fix for IE CRM popup +# 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # -$version = '2.2.0-254'; -$build = '100301-1329'; +$version = '2.2.0-256'; +$build = '100315-1149'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -2749,6 +2751,8 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var timer_action_message=''; var timer_action_seconds=''; var pause_code_counter=1; + var last_uniqueid=''; + var tmp_vicidial_id=''; var DiaLControl_auto_HTML = "\"\"Резюме\""; var DiaLControl_auto_HTML_ready = "\"\"Резюме\""; var DiaLControl_auto_HTML_OFF = "\"\"Резюме\""; @@ -3692,11 +3696,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (inOUT == 'OUT') { - var tmp_vicidial_id = document.vicidial_form.uniqueid.value; + tmp_vicidial_id = document.vicidial_form.uniqueid.value; } else { - var tmp_vicidial_id = 'IN'; + tmp_vicidial_id = 'IN'; } var xmlhttp=false; /*@cc_on @*/ @@ -4658,6 +4662,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} custchannellive=1; document.vicidial_form.uniqueid.value = MDlookResponse_array[0]; + last_uniqueid = MDlookResponse_array[0]; document.vicidial_form.callchannel.value = MDlookResponse_array[1]; lastcustchannel = MDlookResponse_array[1]; if( document.images ) { document.images['livecall'].src = image_livecall_ON.src;} @@ -6434,6 +6439,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.vicidial_form.lead_id.value = VDIC_data_VDAC[0]; document.vicidial_form.uniqueid.value = VDIC_data_VDAC[1]; + last_uniqueid = VDIC_data_VDAC[1]; CIDcheck = VDIC_data_VDAC[2]; CalLCID = VDIC_data_VDAC[2]; document.vicidial_form.callchannel.value = VDIC_data_VDAC[3]; @@ -7968,7 +7974,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&comments=" + CallBackCommenTs; + DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&uniqueid=" + last_uniqueid + "&comments=" + CallBackCommenTs; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(DSupdate_query); @@ -8027,6 +8033,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} vtiger_callback_id='0'; recording_filename=''; recording_id=''; + document.vicidial_form.uniqueid.value=''; + MDuniqueid=''; + XDuniqueid=''; + tmp_vicidial_id=''; if (manual_dial_in_progress==1) { @@ -9900,7 +9910,8 @@ else var TEMP_crm_login_address = decoded; TEMP_crm_login_address = TEMP_crm_login_address.replace(regWFAcustom, ''); - CRMwin = window.open(TEMP_crm_login_address, 'CRMwin,toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); + var CRMwin = 'CRMwin'; + CRMwin = window.open(TEMP_crm_login_address, CRMwin,'toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); CRMwin.blur(); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/dbconnect.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/dbconnect.php index 89d88689..e02ca392 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/dbconnect.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/dbconnect.php @@ -4,46 +4,49 @@ # # database connection settings and some global web settings # -# Copyright (C) 2009 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # if ( file_exists("/etc/astguiclient.conf") ) -{ -$DBCagc = file("/etc/astguiclient.conf"); -foreach ($DBCagc as $DBCline) { - $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); - if (ereg("^PATHlogs", $DBCline)) - {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} - if (ereg("^PATHweb", $DBCline)) - {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} - if (ereg("^VARDB_server", $DBCline)) - {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} - if (ereg("^VARDB_database", $DBCline)) - {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} - if (ereg("^VARDB_user", $DBCline)) - {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} - if (ereg("^VARDB_pass", $DBCline)) - {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} - if (ereg("^VARDB_port", $DBCline)) - {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + $DBCagc = file("/etc/astguiclient.conf"); + foreach ($DBCagc as $DBCline) + { + $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); + if (ereg("^PATHlogs", $DBCline)) + {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} + if (ereg("^PATHweb", $DBCline)) + {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} + if (ereg("^VARserver_ip", $DBCline)) + {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} + if (ereg("^VARDB_server", $DBCline)) + {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} + if (ereg("^VARDB_database", $DBCline)) + {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} + if (ereg("^VARDB_user", $DBCline)) + {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} + if (ereg("^VARDB_pass", $DBCline)) + {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} + if (ereg("^VARDB_port", $DBCline)) + {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + } + } +else + { + #defaults for DB connection + $VARDB_server = 'localhost'; + $VARDB_port = '3306'; + $VARDB_user = 'cron'; + $VARDB_pass = '1234'; + $VARDB_database = '1234'; + $WeBServeRRooT = '/usr/local/apache2/htdocs'; } -} -else -{ -#defaults for DB connection -$VARDB_server = 'localhost'; -$VARDB_user = 'cron'; -$VARDB_pass = '1234'; -$VARDB_database = '1234'; -$WeBServeRRooT = '/usr/local/apache2/htdocs'; -} - -$link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass"); -if (!$link) { +$link=mysql_connect("$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass"); +if (!$link) + { die('MySQL connect ERROR: ' . mysql_error()); -} -mysql_select_db("$VARDB_database",$link); + } +mysql_select_db("$VARDB_database"); $local_DEF = 'Local/'; $conf_silent_prefix = '7'; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vicidial.php index 55a6ee0d..8681ac10 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vicidial.php @@ -276,10 +276,12 @@ # 100207-1109 - Changed Pause Codes function to allow for multiple pause codes per pause period # 100228-1257 - Fixed no-selected default transfer group issue on inbound calls # 100301-1329 - Changed AGENTDIRECT user selection launching to AGENTS link next to number-to-dial field +# 100309-1709 - small fix for IE CRM popup +# 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # -$version = '2.2.0-254'; -$build = '100301-1329'; +$version = '2.2.0-256'; +$build = '100315-1149'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -2749,6 +2751,8 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var timer_action_message=''; var timer_action_seconds=''; var pause_code_counter=1; + var last_uniqueid=''; + var tmp_vicidial_id=''; var DiaLControl_auto_HTML = "\"\"Pokračovať\""; var DiaLControl_auto_HTML_ready = "\"\"Pokračovať\""; var DiaLControl_auto_HTML_OFF = "\"\"Pokračovať\""; @@ -3692,11 +3696,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (inOUT == 'OUT') { - var tmp_vicidial_id = document.vicidial_form.uniqueid.value; + tmp_vicidial_id = document.vicidial_form.uniqueid.value; } else { - var tmp_vicidial_id = 'IN'; + tmp_vicidial_id = 'IN'; } var xmlhttp=false; /*@cc_on @*/ @@ -4658,6 +4662,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} custchannellive=1; document.vicidial_form.uniqueid.value = MDlookResponse_array[0]; + last_uniqueid = MDlookResponse_array[0]; document.vicidial_form.callchannel.value = MDlookResponse_array[1]; lastcustchannel = MDlookResponse_array[1]; if( document.images ) { document.images['livecall'].src = image_livecall_ON.src;} @@ -6434,6 +6439,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.vicidial_form.lead_id.value = VDIC_data_VDAC[0]; document.vicidial_form.uniqueid.value = VDIC_data_VDAC[1]; + last_uniqueid = VDIC_data_VDAC[1]; CIDcheck = VDIC_data_VDAC[2]; CalLCID = VDIC_data_VDAC[2]; document.vicidial_form.callchannel.value = VDIC_data_VDAC[3]; @@ -7968,7 +7974,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&comments=" + CallBackCommenTs; + DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&uniqueid=" + last_uniqueid + "&comments=" + CallBackCommenTs; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(DSupdate_query); @@ -8027,6 +8033,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} vtiger_callback_id='0'; recording_filename=''; recording_id=''; + document.vicidial_form.uniqueid.value=''; + MDuniqueid=''; + XDuniqueid=''; + tmp_vicidial_id=''; if (manual_dial_in_progress==1) { @@ -9900,7 +9910,8 @@ else var TEMP_crm_login_address = decoded; TEMP_crm_login_address = TEMP_crm_login_address.replace(regWFAcustom, ''); - CRMwin = window.open(TEMP_crm_login_address, 'CRMwin,toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); + var CRMwin = 'CRMwin'; + CRMwin = window.open(TEMP_crm_login_address, CRMwin,'toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); CRMwin.blur(); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/dbconnect.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/dbconnect.php index 89d88689..e02ca392 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/dbconnect.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/dbconnect.php @@ -4,46 +4,49 @@ # # database connection settings and some global web settings # -# Copyright (C) 2009 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # if ( file_exists("/etc/astguiclient.conf") ) -{ -$DBCagc = file("/etc/astguiclient.conf"); -foreach ($DBCagc as $DBCline) { - $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); - if (ereg("^PATHlogs", $DBCline)) - {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} - if (ereg("^PATHweb", $DBCline)) - {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} - if (ereg("^VARDB_server", $DBCline)) - {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} - if (ereg("^VARDB_database", $DBCline)) - {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} - if (ereg("^VARDB_user", $DBCline)) - {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} - if (ereg("^VARDB_pass", $DBCline)) - {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} - if (ereg("^VARDB_port", $DBCline)) - {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + $DBCagc = file("/etc/astguiclient.conf"); + foreach ($DBCagc as $DBCline) + { + $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); + if (ereg("^PATHlogs", $DBCline)) + {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} + if (ereg("^PATHweb", $DBCline)) + {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} + if (ereg("^VARserver_ip", $DBCline)) + {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} + if (ereg("^VARDB_server", $DBCline)) + {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} + if (ereg("^VARDB_database", $DBCline)) + {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} + if (ereg("^VARDB_user", $DBCline)) + {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} + if (ereg("^VARDB_pass", $DBCline)) + {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} + if (ereg("^VARDB_port", $DBCline)) + {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + } + } +else + { + #defaults for DB connection + $VARDB_server = 'localhost'; + $VARDB_port = '3306'; + $VARDB_user = 'cron'; + $VARDB_pass = '1234'; + $VARDB_database = '1234'; + $WeBServeRRooT = '/usr/local/apache2/htdocs'; } -} -else -{ -#defaults for DB connection -$VARDB_server = 'localhost'; -$VARDB_user = 'cron'; -$VARDB_pass = '1234'; -$VARDB_database = '1234'; -$WeBServeRRooT = '/usr/local/apache2/htdocs'; -} - -$link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass"); -if (!$link) { +$link=mysql_connect("$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass"); +if (!$link) + { die('MySQL connect ERROR: ' . mysql_error()); -} -mysql_select_db("$VARDB_database",$link); + } +mysql_select_db("$VARDB_database"); $local_DEF = 'Local/'; $conf_silent_prefix = '7'; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vicidial.php index 96a53353..6fc70ed8 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vicidial.php @@ -276,10 +276,12 @@ # 100207-1109 - Changed Pause Codes function to allow for multiple pause codes per pause period # 100228-1257 - Fixed no-selected default transfer group issue on inbound calls # 100301-1329 - Changed AGENTDIRECT user selection launching to AGENTS link next to number-to-dial field +# 100309-1709 - small fix for IE CRM popup +# 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # -$version = '2.2.0-254'; -$build = '100301-1329'; +$version = '2.2.0-256'; +$build = '100315-1149'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -2749,6 +2751,8 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var timer_action_message=''; var timer_action_seconds=''; var pause_code_counter=1; + var last_uniqueid=''; + var tmp_vicidial_id=''; var DiaLControl_auto_HTML = "\"\"恢復\""; var DiaLControl_auto_HTML_ready = "\"\"恢復\""; var DiaLControl_auto_HTML_OFF = "\"\"恢復\""; @@ -3692,11 +3696,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { if (inOUT == 'OUT') { - var tmp_vicidial_id = document.vicidial_form.uniqueid.value; + tmp_vicidial_id = document.vicidial_form.uniqueid.value; } else { - var tmp_vicidial_id = 'IN'; + tmp_vicidial_id = 'IN'; } var xmlhttp=false; /*@cc_on @*/ @@ -4658,6 +4662,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} custchannellive=1; document.vicidial_form.uniqueid.value = MDlookResponse_array[0]; + last_uniqueid = MDlookResponse_array[0]; document.vicidial_form.callchannel.value = MDlookResponse_array[1]; lastcustchannel = MDlookResponse_array[1]; if( document.images ) { document.images['livecall'].src = image_livecall_ON.src;} @@ -6434,6 +6439,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.vicidial_form.lead_id.value = VDIC_data_VDAC[0]; document.vicidial_form.uniqueid.value = VDIC_data_VDAC[1]; + last_uniqueid = VDIC_data_VDAC[1]; CIDcheck = VDIC_data_VDAC[2]; CalLCID = VDIC_data_VDAC[2]; document.vicidial_form.callchannel.value = VDIC_data_VDAC[3]; @@ -7968,7 +7974,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} } if (xmlhttp) { - DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&comments=" + CallBackCommenTs; + DSupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=updateDISPO&format=text&user=" + user + "&pass=" + pass + "&dispo_choice=" + DispoChoice + "&lead_id=" + document.vicidial_form.lead_id.value + "&campaign=" + campaign + "&auto_dial_level=" + auto_dial_level + "&agent_log_id=" + agent_log_id + "&CallBackDatETimE=" + CallBackDatETimE + "&list_id=" + document.vicidial_form.list_id.value + "&recipient=" + CallBackrecipient + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&MDnextCID=" + LasTCID + "&stage=" + group + "&vtiger_callback_id=" + vtiger_callback_id + "&phone_number=" + document.vicidial_form.phone_number.value + "&phone_code=" + document.vicidial_form.phone_code.value + "&dial_method" + dial_method + "&uniqueid=" + last_uniqueid + "&comments=" + CallBackCommenTs; xmlhttp.open('POST', 'vdc_db_query.php'); xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); xmlhttp.send(DSupdate_query); @@ -8027,6 +8033,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} vtiger_callback_id='0'; recording_filename=''; recording_id=''; + document.vicidial_form.uniqueid.value=''; + MDuniqueid=''; + XDuniqueid=''; + tmp_vicidial_id=''; if (manual_dial_in_progress==1) { @@ -9900,7 +9910,8 @@ else var TEMP_crm_login_address = decoded; TEMP_crm_login_address = TEMP_crm_login_address.replace(regWFAcustom, ''); - CRMwin = window.open(TEMP_crm_login_address, 'CRMwin,toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); + var CRMwin = 'CRMwin'; + CRMwin = window.open(TEMP_crm_login_address, CRMwin,'toolbar=1,location=1,directories=1,status=1,menubar=1,scrollbars=1,resizable=1,width=700,height=480'); CRMwin.blur(); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/AST_agent_status_detail.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/AST_agent_status_detail.php index 3883ee2c..86487bf1 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/AST_agent_status_detail.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/AST_agent_status_detail.php @@ -338,7 +338,7 @@ else { $Suser=$usersARY[$m]; $Sfull_name=$user_namesARY[$m]; - $Scalls=$calls[$m]; + $Scalls=0; $SstatusesHTML=''; $SstatusesFILE=''; $CIScount=0; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/AST_timeonVDADall.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/AST_timeonVDADall.php index ce013332..f3cd3dd1 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/AST_timeonVDADall.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/AST_timeonVDADall.php @@ -60,10 +60,11 @@ # 91204-1548 - Added ability to change agent in-groups and blended # 100214-1127 - Added no-dialable-leads alert and in-groups stats option # 100301-1229 - Added 3-WAY status for consultative transfer agents +# 100303-0930 - Added carrier stats display option # -$version = '2.2.0-51'; -$build = '100301-1229'; +$version = '2.2.0-52'; +$build = '100303-0930'; header ("Content-type: text/html; charset=utf-8"); @@ -123,6 +124,8 @@ if (isset($_GET["monitor_active"])) {$monitor_active=$_GET["monitor_active"]; elseif (isset($_POST["monitor_active"])) {$monitor_active=$_POST["monitor_active"];} if (isset($_GET["monitor_phone"])) {$monitor_phone=$_GET["monitor_phone"];} elseif (isset($_POST["monitor_phone"])) {$monitor_phone=$_POST["monitor_phone"];} +if (isset($_GET["CARRIERstats"])) {$CARRIERstats=$_GET["CARRIERstats"];} + elseif (isset($_POST["CARRIERstats"])) {$CARRIERstats=$_POST["CARRIERstats"];} ############################################# @@ -155,7 +158,7 @@ if (!isset($PAUSEcodes)) {$PAUSEcodes='N';} # 0=no, 1=yes if (!isset($with_inbound)) { if ($outbound_autodial_active > 0) - {$with_inbound='N';} # N=no, Y=yes, O=only + {$with_inbound='Y';} # N=no, Y=yes, O=only else {$with_inbound='O';} # N=no, Y=yes, O=only } @@ -216,8 +219,18 @@ $NOW_TIME = date("Y-m-d H:i:s"); $NOW_DAY = date("Y-m-d"); $NOW_HOUR = date("H:i:s"); $STARTtime = date("U"); +$epochONEminuteAGO = ($STARTtime - 60); +$timeONEminuteAGO = date("Y-m-d H:i:s",$epochONEminuteAGO); +$epochFIVEminutesAGO = ($STARTtime - 300); +$timeFIVEminutesAGO = date("Y-m-d H:i:s",$epochFIVEminutesAGO); +$epochFIFTEENminutesAGO = ($STARTtime - 900); +$timeFIFTEENminutesAGO = date("Y-m-d H:i:s",$epochFIFTEENminutesAGO); +$epochONEhourAGO = ($STARTtime - 3600); +$timeONEhourAGO = date("Y-m-d H:i:s",$epochONEhourAGO); $epochSIXhoursAGO = ($STARTtime - 21600); $timeSIXhoursAGO = date("Y-m-d H:i:s",$epochSIXhoursAGO); +$epochTWENTYFOURhoursAGO = ($STARTtime - 86400); +$timeTWENTYFOURhoursAGO = date("Y-m-d H:i:s",$epochTWENTYFOURhoursAGO); $PHP_AUTH_USER = ereg_replace("[^0-9a-zA-Z]","",$PHP_AUTH_USER); @@ -325,7 +338,7 @@ $NFB = ''; $NFE = ''; $F=''; $FG=''; $B=''; $BG=''; -$select_list = "
Select Kampagnen:
"; +$select_list = "
Select Kampagnen:
"; $select_list .= ""; $select_list .= "
(Um mehr als 1 Kampagne, halten Sie die Strg-Taste gedrückt und klicken Sie auf)"; $select_list .= "		"; $select_list .= "Fenster schließen

"; +$select_list .= ""; -if ($UGdisplay > 0) - { - $select_list .= "Select Benutzer-Gruppe:
"; - $select_list .= "

"; - } - -$select_list .= "   Inbound: "; +$select_list .= ""; -$select_list .= "   Dialable Leads Alert:
"; + } + +$select_list .= ""; $select_list .= ""; -$select_list .= "
"; +$select_list .= "Inbound:
 
"; + $select_list .= "Select Benutzer-Gruppe: "; + $select_list .= "
"; +$select_list .= "Dialable Leads Alert:
"; $select_list .= "   "; $select_list .= ""; +$select_list .= ""; $select_list .= "VERSION: $version   BAU: $build"; $select_list .= "
"; @@ -707,7 +739,7 @@ $rslt=mysql_query($stmt, $link); $campaign_allow_inbound = $row[0]; echo "\n"; -echo"\n"; +echo"\n"; echo "Real-Time Report: $group\n"; $short_header=1; @@ -734,6 +766,7 @@ echo "\n"; echo "\n"; echo "\n"; echo "\n"; +echo "\n"; echo "Real-Time Report                                                                               \n"; echo "\n"; echo ""; + } + +# http://svn.eflo.net:40080/vicidial/AST_timeonVDADall.php?&groups[]=ALL-ACTIVE&RR=4000&DB=0&adastats=&SIPmonitorLINK=&IAXmonitorLINK=&usergroup=&UGdisplay=1&UidORname=1&orderby=timeup&SERVdisplay=0&CALLSdisplay=1&PHONEdisplay=0&CUSTPHONEdisplay=0&with_inbound=Y&monitor_active=&monitor_phone=350a&ALLINGROUPstats=1&DROPINGROUPstats=0&NOLEADSalert=&CARRIERstats=1 + ##### INBOUND ONLY ### if (ereg('O',$with_inbound)) { @@ -1272,6 +1464,7 @@ else echo ""; echo "$DROPINGROUPstatsHTML\n"; + echo "$CARRIERstatsHTML\n"; } echo ""; @@ -1292,60 +1485,60 @@ echo "$ingroup_detail"; if ($adastats<2) { - echo "+ VIEW MORE"; + echo "+ VIEW MORE"; } else { - echo "+ VIEW LESS"; + echo "+ VIEW LESS"; } if ($UGdisplay>0) { - echo "       Verberge User Group"; + echo "       Verberge User Group"; } else { - echo "       VIEW User Group"; + echo "       VIEW User Group"; } if ($SERVdisplay>0) { - echo "       Verberge BEDIENERINFO"; + echo "       Verberge BEDIENERINFO"; } else { - echo "       Zeige BEDIENERINFO"; + echo "       Zeige BEDIENERINFO"; } if ($CALLSdisplay>0) { - echo "       Verberge WAITING CALLS"; + echo "       Verberge WAITING CALLS"; } else { - echo "       Zeige WAITING CALLS"; + echo "       Zeige WAITING CALLS"; } if ($ALLINGROUPstats>0) { - echo "       Verberge IN-GROUP STATS"; + echo "       Verberge IN-GROUP STATS"; } else { - echo "       Zeige IN-GROUP STATS"; + echo "       Zeige IN-GROUP STATS"; } if ($PHONEdisplay>0) { - echo "       Verberge PHONES"; + echo "       Verberge PHONES"; } else { - echo "       Zeige PHONES"; + echo "       Zeige PHONES"; } if ($CUSTPHONEdisplay>0) { - echo "       Verberge CUSTPHONES"; + echo "       Verberge CUSTPHONES"; } else { - echo "       Zeige CUSTPHONES"; + echo "       Zeige CUSTPHONES"; } echo ""; echo ""; @@ -1390,6 +1583,20 @@ if ( ($with_inbound != 'O') and ($NOLEADSalert == 'YES') ) ################################################################################### if ($campaign_allow_inbound > 0) { + if (eregi('ALL-ACTIVE',$group_string)) + { + $stmt="select closer_campaigns from vicidial_campaigns $group_SQLwhere"; + $rslt=mysql_query($stmt, $link); + $closer_campaigns=""; + while ($row=mysql_fetch_row($rslt)) + { + $closer_campaigns.="$row[0]"; + } + $closer_campaigns = preg_replace("/^ | -$/","",$closer_campaigns); + $closer_campaigns = preg_replace("/ - /"," ",$closer_campaigns); + $closer_campaigns = preg_replace("/ /","','",$closer_campaigns); + $closer_campaignsSQL = "'$closer_campaigns'"; + } $stmtB="from vicidial_auto_calls where status NOT IN('XFER') and ( (call_type='IN' and campaign_id IN($closer_campaignsSQL)) or (call_type IN('OUT','OUTBALANCE') $group_SQLand) ) order by queue_priority desc,campaign_id,call_time;"; } else @@ -1589,25 +1796,25 @@ $HTbegin = "|"; $HDstation = "----------------+"; $HTstation = " STATION |"; $HDphone = "-------------+"; -$HTphone = " PHONE |"; +$HTphone = " PHONE |"; $HDuser = "------------------------+"; -$HTuser = " USER "; +$HTuser = " USER "; if ($UidORname>0) { - $HTuser .= "Zeige ID "; + $HTuser .= "Zeige ID "; } else { - $HTuser .= "Zeige NAME"; + $HTuser .= "Zeige NAME"; } $HTuser .= " INFO |"; $HDusergroup = "--------------+"; -$HTusergroup = " User Group |"; +$HTusergroup = " User Group |"; $HDsessionid = "------------------+"; $HTsessionid = " SESSIONID |"; $HDbarge = "-------+"; @@ -1621,9 +1828,9 @@ $HTserver_ip = " BEDIENERIP |"; $HDcall_server_ip = "-----------------+"; $HTcall_server_ip = " CALL BEDIENERIP |"; $HDtime = "---------+"; -$HTtime = " MM:SS |"; +$HTtime = " MM:SS |"; $HDcampaign = "------------+"; -$HTcampaign = " CAMPAIGN |"; +$HTcampaign = " CAMPAIGN |"; $HDcalls = "-------+"; $HTcalls = " CALLS |"; $HDpause = ''; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/admin.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/admin.php index 2c1bc590..053bfabf 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/admin.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/admin.php @@ -2046,11 +2046,12 @@ else # 100103-0727 - Added Start/Dispo call url, 3/4/5 conf number presets, Lists conf-number overrides # 100104-1454 - Fixed in-group/campaign copy duplication issue # 100116-0718 - Added presets to script select list +# 100319-1708 - Changed user/pass for users to 20 characters in length, highlighted conf file secret in phones # # 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.2.0-234'; -$build = '100116-0718'; +$admin_version = '2.2.0-235'; +$build = '100319-1708'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -6398,9 +6399,9 @@ if ($ADD=="1") } else { - echo "\n"; + echo "\n"; } - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; + echo "\n"; } - echo "\n"; + echo "\n"; echo "\n"; if ($LOGuser_level==9) {$levelMAX=10;} @@ -8018,10 +8019,10 @@ if ($ADD=="2") { $user = 'AUTOGENERA'; } - if ( (strlen($user) < 2) or (strlen($pass) < 2) or (strlen($full_name) < 2) or (strlen($user_group) < 2) or ( (strlen($user) > 10) and (!ereg('AUTOGENERA',$user)) ) ) + if ( (strlen($user) < 2) or (strlen($pass) < 2) or (strlen($full_name) < 2) or (strlen($user_group) < 2) or ( (strlen($user) > 20) and (!ereg('AUTOGENERA',$user)) ) ) { echo "
BENUTZER NICHT ADDIERT - gehen Sie bitte zurück und betrachten Siedie Daten, die Sie eingaben\n"; - echo "
user id must be between 2 and 10 characters long\n"; + echo "
user id must be between 2 and 20 characters long\n"; echo "
voller Name und Kennwort müssen mindestens 2 Buchstaben lang sein\n"; echo "
Sie müssen sich für eine Benutzergruppe\n"; } @@ -8296,10 +8297,10 @@ if ($ADD=="2A") {echo "
BENUTZER NICHT ADDIERT - es gibt bereits einen Benutzer im System mitdieser Benutzerzahl\n";} else { - if ( (strlen($user) < 2) or (strlen($pass) < 2) or (strlen($full_name) < 2) or (strlen($user) > 10) ) + if ( (strlen($user) < 2) or (strlen($pass) < 2) or (strlen($full_name) < 2) or (strlen($user) > 20) ) { echo "
BENUTZER NICHT ADDIERT - gehen Sie bitte zurück und betrachten Siedie Daten, die Sie eingaben\n"; - echo "
user id must be between 2 and 10 characters long\n"; + echo "
user id must be between 2 and 20 characters long\n"; echo "
voller Name und Kennwort müssen mindestens 2 Buchstaben lang sein\n"; echo "\n"; } @@ -20373,7 +20374,7 @@ if ($ADD==31111) echo "\n"; echo "\n"; echo "
\n"; @@ -743,9 +776,9 @@ echo "\n"; echo "\n"; echo "   "; echo "\n"; -echo "STOP | "; -echo "SLOW | "; -echo "GO"; +echo "STOP | "; +echo "SLOW | "; +echo "GO"; if (eregi('ALL-ACTIVE',$group_string)) { echo "       ÄNDERN Sie | \n"; @@ -936,6 +969,7 @@ if ( ($DROPINGROUPstats > 0) and (!preg_match("/ALL-ACTIVE/",$group_string)) ) $dtp++; } $DIGcampaigns = preg_replace("/,$/",'',$DIGcampaigns); + if (strlen($DIGcampaigns) < 2) {$DIGcampaigns = "''";} $stmtB="select sum(calls_today),sum(drops_today),sum(answers_today) from vicidial_campaign_stats where campaign_id IN($DIGcampaigns);"; if ($DB > 0) {echo "\n|$stmtB|\n";} @@ -963,6 +997,164 @@ if ( ($DROPINGROUPstats > 0) and (!preg_match("/ALL-ACTIVE/",$group_string)) ) } +##### CARRIER STATS TOTALS ### +$CARRIERstatsHTML=''; +if ($CARRIERstats > 0) + { + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeTWENTYFOURhoursAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $car_to_print = mysql_num_rows($rslt); + $ctp=0; + while ($car_to_print > $ctp) + { + $row=mysql_fetch_row($rslt); + $TFhour_status[$ctp] = $row[0]; + $TFhour_count[$ctp] = $row[1]; + $dialstatuses .= "'$row[0]',"; + $ctp++; + } + $dialstatuses = preg_replace("/,$/",'',$dialstatuses); + + $CARRIERstatsHTML .= "
"; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + + if (strlen($dialstatuses) > 1) + { + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeSIXhoursAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$SIXhour_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeONEhourAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$ONEhour_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeFIFTEENminutesAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$FTminute_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeFIVEminutesAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$FIVEminute_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeONEminuteAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$ONEminute_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + + $print_ctp=0; + while ($print_ctp < $ctp) + { + if (strlen($TFhour_count[$print_ctp])<1) {$TFhour_count[$print_ctp]=0;} + if (strlen($SIXhour_count[$print_ctp])<1) {$SIXhour_count[$print_ctp]=0;} + if (strlen($ONEhour_count[$print_ctp])<1) {$ONEhour_count[$print_ctp]=0;} + if (strlen($FTminute_count[$print_ctp])<1) {$FTminute_count[$print_ctp]=0;} + if (strlen($FIVEminute_count[$print_ctp])<1) {$FIVEminute_count[$print_ctp]=0;} + if (strlen($ONEminute_count[$print_ctp])<1) {$ONEminute_count[$print_ctp]=0;} + + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $print_ctp++; + } + } + else + { + $CARRIERstatsHTML .= ""; + } + $CARRIERstatsHTML .= "
CARRIER STATS:                 HANGUP STATUS     24 HOURS     6 HOURS     1 HOUR     15 MIN     5 MIN     1 MIN  
     $TFhour_status[$print_ctp] $TFhour_count[$print_ctp] $SIXhour_count[$print_ctp] $ONEhour_count[$print_ctp] $FTminute_count[$print_ctp] $FIVEminute_count[$print_ctp] $ONEminute_count[$print_ctp]
no log entries
"; + $CARRIERstatsHTML .= "
Benutzer-Zahl: $NWB#vicidial_users-user$NWE
Benutzer-Zahl: $NWB#vicidial_users-user$NWE
Kennwort:$NWB#vicidial_users-pass$NWE
Kennwort:$NWB#vicidial_users-pass$NWE
Voller Name: $NWB#vicidial_users-full_name$NWE
Benutzer-Niveau:
Benutzer-Zahl: $NWB#vicidial_users-user$NWE
Benutzer-Zahl: $NWB#vicidial_users-user$NWE
Kennwort:$NWB#vicidial_users-pass$NWE
Kennwort:$NWB#vicidial_users-pass$NWE
Voller Name: $NWB#vicidial_users-full_name$NWE
\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/dbconnect.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/dbconnect.php index dca45485..ca505cc0 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/dbconnect.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/dbconnect.php @@ -4,47 +4,48 @@ # # database connection settings and some global web settings # -# Copyright (C) 2009 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # if ( file_exists("/etc/astguiclient.conf") ) -{ -$DBCagc = file("/etc/astguiclient.conf"); -foreach ($DBCagc as $DBCline) { - $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); - if (ereg("^PATHlogs", $DBCline)) - {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} - if (ereg("^PATHweb", $DBCline)) - {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} - if (ereg("^VARserver_ip", $DBCline)) - {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} - if (ereg("^VARDB_server", $DBCline)) - {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} - if (ereg("^VARDB_database", $DBCline)) - {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} - if (ereg("^VARDB_user", $DBCline)) - {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} - if (ereg("^VARDB_pass", $DBCline)) - {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} - if (ereg("^VARDB_port", $DBCline)) - {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + $DBCagc = file("/etc/astguiclient.conf"); + foreach ($DBCagc as $DBCline) + { + $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); + if (ereg("^PATHlogs", $DBCline)) + {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} + if (ereg("^PATHweb", $DBCline)) + {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} + if (ereg("^VARserver_ip", $DBCline)) + {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} + if (ereg("^VARDB_server", $DBCline)) + {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} + if (ereg("^VARDB_database", $DBCline)) + {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} + if (ereg("^VARDB_user", $DBCline)) + {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} + if (ereg("^VARDB_pass", $DBCline)) + {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} + if (ereg("^VARDB_port", $DBCline)) + {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + } + } +else + { + #defaults for DB connection + $VARDB_server = 'localhost'; + $VARDB_port = '3306'; + $VARDB_user = 'cron'; + $VARDB_pass = '1234'; + $VARDB_database = '1234'; + $WeBServeRRooT = '/usr/local/apache2/htdocs'; } -} -else -{ -#defaults for DB connection -$VARDB_server = 'localhost'; -$VARDB_user = 'cron'; -$VARDB_pass = '1234'; -$VARDB_database = '1234'; -$WeBServeRRooT = '/usr/local/apache2/htdocs'; -} - -$link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass"); -if (!$link) { +$link=mysql_connect("$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass"); +if (!$link) + { die('MySQL connect ERROR: ' . mysql_error()); -} + } mysql_select_db("$VARDB_database"); $local_DEF = 'Local/'; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/new_listloader_superL.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/new_listloader_superL.php index ed71b514..9a0f6fd3 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/new_listloader_superL.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/new_listloader_superL.php @@ -1638,7 +1638,7 @@ exit; function lookup_gmt($phone_code,$USarea,$state,$LOCAL_GMT_OFF_STD,$Shour,$Smin,$Ssec,$Smon,$Smday,$Syear,$postalgmt,$postal_code) { -require("dbconnect.php"); +global $link; $postalgmt_found=0; if ( (eregi("POSTAL",$postalgmt)) && (strlen($postal_code)>4) ) diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/AST_agent_status_detail.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/AST_agent_status_detail.php index 10c508a7..9a1863c3 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/AST_agent_status_detail.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/AST_agent_status_detail.php @@ -338,7 +338,7 @@ else { $Suser=$usersARY[$m]; $Sfull_name=$user_namesARY[$m]; - $Scalls=$calls[$m]; + $Scalls=0; $SstatusesHTML=''; $SstatusesFILE=''; $CIScount=0; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/AST_timeonVDADall.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/AST_timeonVDADall.php index f18d161e..6ca72a90 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/AST_timeonVDADall.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/AST_timeonVDADall.php @@ -60,10 +60,11 @@ # 91204-1548 - Added ability to change agent in-groups and blended # 100214-1127 - Added no-dialable-leads alert and in-groups stats option # 100301-1229 - Added 3-WAY status for consultative transfer agents +# 100303-0930 - Added carrier stats display option # -$version = '2.2.0-51'; -$build = '100301-1229'; +$version = '2.2.0-52'; +$build = '100303-0930'; header ("Content-type: text/html; charset=utf-8"); @@ -123,6 +124,8 @@ if (isset($_GET["monitor_active"])) {$monitor_active=$_GET["monitor_active"]; elseif (isset($_POST["monitor_active"])) {$monitor_active=$_POST["monitor_active"];} if (isset($_GET["monitor_phone"])) {$monitor_phone=$_GET["monitor_phone"];} elseif (isset($_POST["monitor_phone"])) {$monitor_phone=$_POST["monitor_phone"];} +if (isset($_GET["CARRIERstats"])) {$CARRIERstats=$_GET["CARRIERstats"];} + elseif (isset($_POST["CARRIERstats"])) {$CARRIERstats=$_POST["CARRIERstats"];} ############################################# @@ -155,7 +158,7 @@ if (!isset($PAUSEcodes)) {$PAUSEcodes='N';} # 0=no, 1=yes if (!isset($with_inbound)) { if ($outbound_autodial_active > 0) - {$with_inbound='N';} # N=no, Y=yes, O=only + {$with_inbound='Y';} # N=no, Y=yes, O=only else {$with_inbound='O';} # N=no, Y=yes, O=only } @@ -216,8 +219,18 @@ $NOW_TIME = date("Y-m-d H:i:s"); $NOW_DAY = date("Y-m-d"); $NOW_HOUR = date("H:i:s"); $STARTtime = date("U"); +$epochONEminuteAGO = ($STARTtime - 60); +$timeONEminuteAGO = date("Y-m-d H:i:s",$epochONEminuteAGO); +$epochFIVEminutesAGO = ($STARTtime - 300); +$timeFIVEminutesAGO = date("Y-m-d H:i:s",$epochFIVEminutesAGO); +$epochFIFTEENminutesAGO = ($STARTtime - 900); +$timeFIFTEENminutesAGO = date("Y-m-d H:i:s",$epochFIFTEENminutesAGO); +$epochONEhourAGO = ($STARTtime - 3600); +$timeONEhourAGO = date("Y-m-d H:i:s",$epochONEhourAGO); $epochSIXhoursAGO = ($STARTtime - 21600); $timeSIXhoursAGO = date("Y-m-d H:i:s",$epochSIXhoursAGO); +$epochTWENTYFOURhoursAGO = ($STARTtime - 86400); +$timeTWENTYFOURhoursAGO = date("Y-m-d H:i:s",$epochTWENTYFOURhoursAGO); $PHP_AUTH_USER = ereg_replace("[^0-9a-zA-Z]","",$PHP_AUTH_USER); @@ -325,7 +338,7 @@ $NFB = ''; $NFE = ''; $F=''; $FG=''; $B=''; $BG=''; -$select_list = "
Benutzernummer Anfang: (nur Zahlen, incremented)$NWB#vicidial_remote_agents-user_start$NWE
Benutzernummer Anfang: (nur Zahlen, incremented)$NWB#vicidial_remote_agents-user_start$NWE
Zeilenzahl: (nur Zahlen)$NWB#vicidial_remote_agents-number_of_lines$NWE
Bediener IP:
VMailDump Exten: $NWB#phones-voicemail_dump_exten$NWE
Exten Kontext: $NWB#phones-ext_context$NWE
Telefon Kontext: $NWB#phones-phone_context$NWE
Conf-Datei Secret: $NWB#phones-conf_secret$NWE
Conf-Datei Secret: $NWB#phones-conf_secret$NWE
DTMFSend Führung: $NWB#phones-dtmf_send_extension$NWE
Outbound Anruf-Gruppe: $NWB#phones-call_out_number_group$NWE
Datenbanksuchroutine-Position: $NWB#phones-client_browser$NWE
Select Εκστρατείες:
"; +$select_list = "
Select Εκστρατείες:
"; $select_list .= ""; $select_list .= "
(Για να επιλέξετε περισσότερα από 1 εκστρατείας, κρατήστε πατημένο το πλήκτρο Ctrl και κάντε κλικ)"; $select_list .= "		"; $select_list .= "Κλείστε Panel

"; +$select_list .= ""; -if ($UGdisplay > 0) - { - $select_list .= "Select Ομάδα Χρήστη:
"; - $select_list .= "

"; - } - -$select_list .= "   Inbound: "; +$select_list .= ""; -$select_list .= "   Dialable Leads Alert:
"; + } + +$select_list .= ""; $select_list .= ""; -$select_list .= "
"; +$select_list .= "Inbound:
 
"; + $select_list .= "Select Ομάδα Χρήστη: "; + $select_list .= "
"; +$select_list .= "Dialable Leads Alert:
"; $select_list .= "   "; $select_list .= ""; +$select_list .= ""; $select_list .= "ΕΚΔΟΣΗ: $version   ΔΗΜΙΟΥΡΓΙΑ: $build"; $select_list .= "
"; @@ -707,7 +739,7 @@ $rslt=mysql_query($stmt, $link); $campaign_allow_inbound = $row[0]; echo "\n"; -echo"\n"; +echo"\n"; echo "Real-Time Report: $group\n"; $short_header=1; @@ -734,6 +766,7 @@ echo "\n"; echo "\n"; echo "\n"; echo "\n"; +echo "\n"; echo "Real-Time Report                                                                               \n"; echo "\n"; echo ""; + } + +# http://svn.eflo.net:40080/vicidial/AST_timeonVDADall.php?&groups[]=ALL-ACTIVE&RR=4000&DB=0&adastats=&SIPmonitorLINK=&IAXmonitorLINK=&usergroup=&UGdisplay=1&UidORname=1&orderby=timeup&SERVdisplay=0&CALLSdisplay=1&PHONEdisplay=0&CUSTPHONEdisplay=0&with_inbound=Y&monitor_active=&monitor_phone=350a&ALLINGROUPstats=1&DROPINGROUPstats=0&NOLEADSalert=&CARRIERstats=1 + ##### INBOUND ONLY ### if (ereg('O',$with_inbound)) { @@ -1272,6 +1464,7 @@ else echo ""; echo "$DROPINGROUPstatsHTML\n"; + echo "$CARRIERstatsHTML\n"; } echo ""; @@ -1292,60 +1485,60 @@ echo "$ingroup_detail"; if ($adastats<2) { - echo "+ VIEW MORE"; + echo "+ VIEW MORE"; } else { - echo "+ VIEW LESS"; + echo "+ VIEW LESS"; } if ($UGdisplay>0) { - echo "       ΑΠΟΚΡΥΨΗ ΟΜΑΔΑ ΧΡΗΣΤΩΝ"; + echo "       ΑΠΟΚΡΥΨΗ ΟΜΑΔΑ ΧΡΗΣΤΩΝ"; } else { - echo "       VIEW ΟΜΑΔΑ ΧΡΗΣΤΩΝ"; + echo "       VIEW ΟΜΑΔΑ ΧΡΗΣΤΩΝ"; } if ($SERVdisplay>0) { - echo "       ΑΠΟΚΡΥΨΗ ΔΙΑΚΟΜΙΣΤΗΣ INFO"; + echo "       ΑΠΟΚΡΥΨΗ ΔΙΑΚΟΜΙΣΤΗΣ INFO"; } else { - echo "       ΕΜΦΑΝΙΣΗ ΔΙΑΚΟΜΙΣΤΗΣ INFO"; + echo "       ΕΜΦΑΝΙΣΗ ΔΙΑΚΟΜΙΣΤΗΣ INFO"; } if ($CALLSdisplay>0) { - echo "       ΑΠΟΚΡΥΨΗ WAITING CALLS"; + echo "       ΑΠΟΚΡΥΨΗ WAITING CALLS"; } else { - echo "       ΕΜΦΑΝΙΣΗ WAITING CALLS"; + echo "       ΕΜΦΑΝΙΣΗ WAITING CALLS"; } if ($ALLINGROUPstats>0) { - echo "       ΑΠΟΚΡΥΨΗ IN-GROUP STATS"; + echo "       ΑΠΟΚΡΥΨΗ IN-GROUP STATS"; } else { - echo "       ΕΜΦΑΝΙΣΗ IN-GROUP STATS"; + echo "       ΕΜΦΑΝΙΣΗ IN-GROUP STATS"; } if ($PHONEdisplay>0) { - echo "       ΑΠΟΚΡΥΨΗ PHONES"; + echo "       ΑΠΟΚΡΥΨΗ PHONES"; } else { - echo "       ΕΜΦΑΝΙΣΗ PHONES"; + echo "       ΕΜΦΑΝΙΣΗ PHONES"; } if ($CUSTPHONEdisplay>0) { - echo "       ΑΠΟΚΡΥΨΗ CUSTPHONES"; + echo "       ΑΠΟΚΡΥΨΗ CUSTPHONES"; } else { - echo "       ΕΜΦΑΝΙΣΗ CUSTPHONES"; + echo "       ΕΜΦΑΝΙΣΗ CUSTPHONES"; } echo ""; echo ""; @@ -1390,6 +1583,20 @@ if ( ($with_inbound != 'O') and ($NOLEADSalert == 'YES') ) ################################################################################### if ($campaign_allow_inbound > 0) { + if (eregi('ALL-ACTIVE',$group_string)) + { + $stmt="select closer_campaigns from vicidial_campaigns $group_SQLwhere"; + $rslt=mysql_query($stmt, $link); + $closer_campaigns=""; + while ($row=mysql_fetch_row($rslt)) + { + $closer_campaigns.="$row[0]"; + } + $closer_campaigns = preg_replace("/^ | -$/","",$closer_campaigns); + $closer_campaigns = preg_replace("/ - /"," ",$closer_campaigns); + $closer_campaigns = preg_replace("/ /","','",$closer_campaigns); + $closer_campaignsSQL = "'$closer_campaigns'"; + } $stmtB="from vicidial_auto_calls where status NOT IN('XFER') and ( (call_type='IN' and campaign_id IN($closer_campaignsSQL)) or (call_type IN('OUT','OUTBALANCE') $group_SQLand) ) order by queue_priority desc,campaign_id,call_time;"; } else @@ -1589,25 +1796,25 @@ $HTbegin = "|"; $HDstation = "----------------+"; $HTstation = " STATION |"; $HDphone = "-------------+"; -$HTphone = " PHONE |"; +$HTphone = " PHONE |"; $HDuser = "------------------------+"; -$HTuser = " USER "; +$HTuser = " USER "; if ($UidORname>0) { - $HTuser .= "ΕΜΦΑΝΙΣΗ ID "; + $HTuser .= "ΕΜΦΑΝΙΣΗ ID "; } else { - $HTuser .= "ΕΜΦΑΝΙΣΗ NAME"; + $HTuser .= "ΕΜΦΑΝΙΣΗ NAME"; } $HTuser .= " INFO |"; $HDusergroup = "--------------+"; -$HTusergroup = " ΟΜΑΔΑ ΧΡΗΣΤΩΝ |"; +$HTusergroup = " ΟΜΑΔΑ ΧΡΗΣΤΩΝ |"; $HDsessionid = "------------------+"; $HTsessionid = " SESSIONID |"; $HDbarge = "-------+"; @@ -1621,9 +1828,9 @@ $HTserver_ip = " ΔΙΑΚΟΜΙΣΤΗΣ IP |"; $HDcall_server_ip = "-----------------+"; $HTcall_server_ip = " CALL ΔΙΑΚΟΜΙΣΤΗΣ IP |"; $HDtime = "---------+"; -$HTtime = " MM:SS |"; +$HTtime = " MM:SS |"; $HDcampaign = "------------+"; -$HTcampaign = " CAMPAIGN |"; +$HTcampaign = " CAMPAIGN |"; $HDcalls = "-------+"; $HTcalls = " CALLS |"; $HDpause = ''; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/admin.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/admin.php index f1134ef6..bc694e93 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/admin.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/admin.php @@ -2046,11 +2046,12 @@ else # 100103-0727 - Added Start/Dispo call url, 3/4/5 conf number presets, Lists conf-number overrides # 100104-1454 - Fixed in-group/campaign copy duplication issue # 100116-0718 - Added presets to script select list +# 100319-1708 - Changed user/pass for users to 20 characters in length, highlighted conf file secret in phones # # 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.2.0-234'; -$build = '100116-0718'; +$admin_version = '2.2.0-235'; +$build = '100319-1708'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -6402,9 +6403,9 @@ if ($ADD=="1") } else { - echo "\n"; + echo "\n"; } - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; + echo "\n"; } - echo "\n"; + echo "\n"; echo "\n"; if ($LOGuser_level==9) {$levelMAX=10;} @@ -8022,10 +8023,10 @@ if ($ADD=="2") { $user = 'AUTOGENERA'; } - if ( (strlen($user) < 2) or (strlen($pass) < 2) or (strlen($full_name) < 2) or (strlen($user_group) < 2) or ( (strlen($user) > 10) and (!ereg('AUTOGENERA',$user)) ) ) + if ( (strlen($user) < 2) or (strlen($pass) < 2) or (strlen($full_name) < 2) or (strlen($user_group) < 2) or ( (strlen($user) > 20) and (!ereg('AUTOGENERA',$user)) ) ) { echo "
Ο ΧΡΗΣΤΗΣ ΔΕΝ ΠΡΟΣΤΕΘΗΚΕ - Παρακαλώ ελέγξτε τα δεδομένα που καταχωρήσατε\n"; - echo "
user id must be between 2 and 10 characters long\n"; + echo "
user id must be between 2 and 20 characters long\n"; echo "
το πλήρες όνομα και κωδικός πρέπει να είναι τουλάχιστον 2 χαρακτήρες\n"; echo "
πρέπει να επιλέξετε μια ομάδα χρηστών\n"; } @@ -8300,10 +8301,10 @@ if ($ADD=="2A") {echo "
Ο ΧΡΗΣΤΗΣ ΔΕΝ ΠΡΟΣΤΕΘΗΚΕ - υπάρχει ήδη ένας χρήστης με αυτό τον αριθμό\n";} else { - if ( (strlen($user) < 2) or (strlen($pass) < 2) or (strlen($full_name) < 2) or (strlen($user) > 10) ) + if ( (strlen($user) < 2) or (strlen($pass) < 2) or (strlen($full_name) < 2) or (strlen($user) > 20) ) { echo "
Ο ΧΡΗΣΤΗΣ ΔΕΝ ΠΡΟΣΤΕΘΗΚΕ - Παρακαλώ ελέγξτε τα δεδομένα που καταχωρήσατε\n"; - echo "
user id must be between 2 and 10 characters long\n"; + echo "
user id must be between 2 and 20 characters long\n"; echo "
το πλήρες όνομα και κωδικός πρέπει να είναι τουλάχιστον 2 χαρακτήρες\n"; echo "\n"; } @@ -20388,7 +20389,7 @@ if ($ADD==31111) echo "\n"; echo "\n"; echo "
\n"; @@ -743,9 +776,9 @@ echo "\n"; echo "\n"; echo "   "; echo "\n"; -echo "STOP | "; -echo "SLOW | "; -echo "GO"; +echo "STOP | "; +echo "SLOW | "; +echo "GO"; if (eregi('ALL-ACTIVE',$group_string)) { echo "       ΤΡΟΠΟΠΟΙΗΣΗ | \n"; @@ -936,6 +969,7 @@ if ( ($DROPINGROUPstats > 0) and (!preg_match("/ALL-ACTIVE/",$group_string)) ) $dtp++; } $DIGcampaigns = preg_replace("/,$/",'',$DIGcampaigns); + if (strlen($DIGcampaigns) < 2) {$DIGcampaigns = "''";} $stmtB="select sum(calls_today),sum(drops_today),sum(answers_today) from vicidial_campaign_stats where campaign_id IN($DIGcampaigns);"; if ($DB > 0) {echo "\n|$stmtB|\n";} @@ -963,6 +997,164 @@ if ( ($DROPINGROUPstats > 0) and (!preg_match("/ALL-ACTIVE/",$group_string)) ) } +##### CARRIER STATS TOTALS ### +$CARRIERstatsHTML=''; +if ($CARRIERstats > 0) + { + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeTWENTYFOURhoursAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $car_to_print = mysql_num_rows($rslt); + $ctp=0; + while ($car_to_print > $ctp) + { + $row=mysql_fetch_row($rslt); + $TFhour_status[$ctp] = $row[0]; + $TFhour_count[$ctp] = $row[1]; + $dialstatuses .= "'$row[0]',"; + $ctp++; + } + $dialstatuses = preg_replace("/,$/",'',$dialstatuses); + + $CARRIERstatsHTML .= "
"; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + + if (strlen($dialstatuses) > 1) + { + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeSIXhoursAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$SIXhour_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeONEhourAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$ONEhour_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeFIFTEENminutesAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$FTminute_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeFIVEminutesAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$FIVEminute_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeONEminuteAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$ONEminute_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + + $print_ctp=0; + while ($print_ctp < $ctp) + { + if (strlen($TFhour_count[$print_ctp])<1) {$TFhour_count[$print_ctp]=0;} + if (strlen($SIXhour_count[$print_ctp])<1) {$SIXhour_count[$print_ctp]=0;} + if (strlen($ONEhour_count[$print_ctp])<1) {$ONEhour_count[$print_ctp]=0;} + if (strlen($FTminute_count[$print_ctp])<1) {$FTminute_count[$print_ctp]=0;} + if (strlen($FIVEminute_count[$print_ctp])<1) {$FIVEminute_count[$print_ctp]=0;} + if (strlen($ONEminute_count[$print_ctp])<1) {$ONEminute_count[$print_ctp]=0;} + + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $print_ctp++; + } + } + else + { + $CARRIERstatsHTML .= ""; + } + $CARRIERstatsHTML .= "
CARRIER STATS:                 HANGUP STATUS     24 HOURS     6 HOURS     1 HOUR     15 MIN     5 MIN     1 MIN  
     $TFhour_status[$print_ctp] $TFhour_count[$print_ctp] $SIXhour_count[$print_ctp] $ONEhour_count[$print_ctp] $FTminute_count[$print_ctp] $FIVEminute_count[$print_ctp] $ONEminute_count[$print_ctp]
no log entries
"; + $CARRIERstatsHTML .= "
Αριθμός Χρήστη: $NWB#vicidial_users-user$NWE
Αριθμός Χρήστη: $NWB#vicidial_users-user$NWE
Κωδικός:$NWB#vicidial_users-pass$NWE
Κωδικός:$NWB#vicidial_users-pass$NWE
Πλήρες Ονομα: $NWB#vicidial_users-full_name$NWE
Επίπεδο Χρήστη:
Αριθμός Χρήστη: $NWB#vicidial_users-user$NWE
Αριθμός Χρήστη: $NWB#vicidial_users-user$NWE
Κωδικός:$NWB#vicidial_users-pass$NWE
Κωδικός:$NWB#vicidial_users-pass$NWE
Πλήρες Ονομα: $NWB#vicidial_users-full_name$NWE
\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/dbconnect.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/dbconnect.php index dca45485..ca505cc0 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/dbconnect.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/dbconnect.php @@ -4,47 +4,48 @@ # # database connection settings and some global web settings # -# Copyright (C) 2009 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # if ( file_exists("/etc/astguiclient.conf") ) -{ -$DBCagc = file("/etc/astguiclient.conf"); -foreach ($DBCagc as $DBCline) { - $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); - if (ereg("^PATHlogs", $DBCline)) - {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} - if (ereg("^PATHweb", $DBCline)) - {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} - if (ereg("^VARserver_ip", $DBCline)) - {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} - if (ereg("^VARDB_server", $DBCline)) - {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} - if (ereg("^VARDB_database", $DBCline)) - {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} - if (ereg("^VARDB_user", $DBCline)) - {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} - if (ereg("^VARDB_pass", $DBCline)) - {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} - if (ereg("^VARDB_port", $DBCline)) - {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + $DBCagc = file("/etc/astguiclient.conf"); + foreach ($DBCagc as $DBCline) + { + $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); + if (ereg("^PATHlogs", $DBCline)) + {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} + if (ereg("^PATHweb", $DBCline)) + {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} + if (ereg("^VARserver_ip", $DBCline)) + {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} + if (ereg("^VARDB_server", $DBCline)) + {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} + if (ereg("^VARDB_database", $DBCline)) + {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} + if (ereg("^VARDB_user", $DBCline)) + {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} + if (ereg("^VARDB_pass", $DBCline)) + {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} + if (ereg("^VARDB_port", $DBCline)) + {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + } + } +else + { + #defaults for DB connection + $VARDB_server = 'localhost'; + $VARDB_port = '3306'; + $VARDB_user = 'cron'; + $VARDB_pass = '1234'; + $VARDB_database = '1234'; + $WeBServeRRooT = '/usr/local/apache2/htdocs'; } -} -else -{ -#defaults for DB connection -$VARDB_server = 'localhost'; -$VARDB_user = 'cron'; -$VARDB_pass = '1234'; -$VARDB_database = '1234'; -$WeBServeRRooT = '/usr/local/apache2/htdocs'; -} - -$link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass"); -if (!$link) { +$link=mysql_connect("$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass"); +if (!$link) + { die('MySQL connect ERROR: ' . mysql_error()); -} + } mysql_select_db("$VARDB_database"); $local_DEF = 'Local/'; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/new_listloader_superL.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/new_listloader_superL.php index 019bddc3..3e67cfe9 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/new_listloader_superL.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/new_listloader_superL.php @@ -1638,7 +1638,7 @@ exit; function lookup_gmt($phone_code,$USarea,$state,$LOCAL_GMT_OFF_STD,$Shour,$Smin,$Ssec,$Smon,$Smday,$Syear,$postalgmt,$postal_code) { -require("dbconnect.php"); +global $link; $postalgmt_found=0; if ( (eregi("POSTAL",$postalgmt)) && (strlen($postal_code)>4) ) diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/AST_agent_status_detail.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/AST_agent_status_detail.php index 18b2f016..7ab5636e 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/AST_agent_status_detail.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/AST_agent_status_detail.php @@ -338,7 +338,7 @@ else { $Suser=$usersARY[$m]; $Sfull_name=$user_namesARY[$m]; - $Scalls=$calls[$m]; + $Scalls=0; $SstatusesHTML=''; $SstatusesFILE=''; $CIScount=0; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/AST_timeonVDADall.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/AST_timeonVDADall.php index c2c01342..72a4dc4a 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/AST_timeonVDADall.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/AST_timeonVDADall.php @@ -60,10 +60,11 @@ # 91204-1548 - Added ability to change agent in-groups and blended # 100214-1127 - Added no-dialable-leads alert and in-groups stats option # 100301-1229 - Added 3-WAY status for consultative transfer agents +# 100303-0930 - Added carrier stats display option # -$version = '2.2.0-51'; -$build = '100301-1229'; +$version = '2.2.0-52'; +$build = '100303-0930'; header ("Content-type: text/html; charset=utf-8"); @@ -123,6 +124,8 @@ if (isset($_GET["monitor_active"])) {$monitor_active=$_GET["monitor_active"]; elseif (isset($_POST["monitor_active"])) {$monitor_active=$_POST["monitor_active"];} if (isset($_GET["monitor_phone"])) {$monitor_phone=$_GET["monitor_phone"];} elseif (isset($_POST["monitor_phone"])) {$monitor_phone=$_POST["monitor_phone"];} +if (isset($_GET["CARRIERstats"])) {$CARRIERstats=$_GET["CARRIERstats"];} + elseif (isset($_POST["CARRIERstats"])) {$CARRIERstats=$_POST["CARRIERstats"];} ############################################# @@ -155,7 +158,7 @@ if (!isset($PAUSEcodes)) {$PAUSEcodes='N';} # 0=no, 1=yes if (!isset($with_inbound)) { if ($outbound_autodial_active > 0) - {$with_inbound='N';} # N=no, Y=yes, O=only + {$with_inbound='Y';} # N=no, Y=yes, O=only else {$with_inbound='O';} # N=no, Y=yes, O=only } @@ -216,8 +219,18 @@ $NOW_TIME = date("Y-m-d H:i:s"); $NOW_DAY = date("Y-m-d"); $NOW_HOUR = date("H:i:s"); $STARTtime = date("U"); +$epochONEminuteAGO = ($STARTtime - 60); +$timeONEminuteAGO = date("Y-m-d H:i:s",$epochONEminuteAGO); +$epochFIVEminutesAGO = ($STARTtime - 300); +$timeFIVEminutesAGO = date("Y-m-d H:i:s",$epochFIVEminutesAGO); +$epochFIFTEENminutesAGO = ($STARTtime - 900); +$timeFIFTEENminutesAGO = date("Y-m-d H:i:s",$epochFIFTEENminutesAGO); +$epochONEhourAGO = ($STARTtime - 3600); +$timeONEhourAGO = date("Y-m-d H:i:s",$epochONEhourAGO); $epochSIXhoursAGO = ($STARTtime - 21600); $timeSIXhoursAGO = date("Y-m-d H:i:s",$epochSIXhoursAGO); +$epochTWENTYFOURhoursAGO = ($STARTtime - 86400); +$timeTWENTYFOURhoursAGO = date("Y-m-d H:i:s",$epochTWENTYFOURhoursAGO); $PHP_AUTH_USER = ereg_replace("[^0-9a-zA-Z]","",$PHP_AUTH_USER); @@ -325,7 +338,7 @@ $NFB = ''; $NFE = ''; $F=''; $FG=''; $B=''; $BG=''; -$select_list = "
ID Χρήστη Ξεκινά: (μόνο αριθμοί, incremented)$NWB#vicidial_remote_agents-user_start$NWE
ID Χρήστη Ξεκινά: (μόνο αριθμοί, incremented)$NWB#vicidial_remote_agents-user_start$NWE
Αριθμός Γραμμών: (μόνο αριθμοί)$NWB#vicidial_remote_agents-number_of_lines$NWE
IP Διακομιστή:
VMailDump Τηλ.σύνδ.: $NWB#phones-voicemail_dump_exten$NWE
Περιεχόμενο Τηλ.σύνδ: $NWB#phones-ext_context$NWE
Τηλέφωνο Πλαίσιο: $NWB#phones-phone_context$NWE
Conf Φάκελος Secret: $NWB#phones-conf_secret$NWE
Conf Φάκελος Secret: $NWB#phones-conf_secret$NWE
DTMFSend Κανάλι: $NWB#phones-dtmf_send_extension$NWE
Ομάδα Εξερχομένων Κλήσεων: $NWB#phones-call_out_number_group$NWE
Θέση Φυλλομετρητή: $NWB#phones-client_browser$NWE
Select Campañas:
"; +$select_list = "
Select Campañas:
"; $select_list .= ""; $select_list .= "
(Para seleccionar más de 1 campaña, mantenga pulsada la tecla Ctrl y haga clic en)"; $select_list .= "		"; $select_list .= "Panel de Cierre

"; +$select_list .= ""; -if ($UGdisplay > 0) - { - $select_list .= "Select Grupo Del Usuario:
"; - $select_list .= "

"; - } - -$select_list .= "   Inbound: "; +$select_list .= ""; -$select_list .= "   Dialable Leads Alert:
"; + } + +$select_list .= ""; $select_list .= ""; -$select_list .= "
"; +$select_list .= "Inbound:
 
"; + $select_list .= "Select Grupo Del Usuario: "; + $select_list .= "
"; +$select_list .= "Dialable Leads Alert:
"; $select_list .= "   "; $select_list .= ""; +$select_list .= ""; $select_list .= "VERSIÓN: $version   CONSTRUCCION: $build"; $select_list .= "
"; @@ -707,7 +739,7 @@ $rslt=mysql_query($stmt, $link); $campaign_allow_inbound = $row[0]; echo "\n"; -echo"\n"; +echo"\n"; echo "Tiempo Real Report: $group\n"; $short_header=1; @@ -734,6 +766,7 @@ echo "\n"; echo "\n"; echo "\n"; echo "\n"; +echo "\n"; echo "Tiempo Real Report                                                                               \n"; echo "\n"; echo ""; + } + +# http://svn.eflo.net:40080/vicidial/AST_timeonVDADall.php?&groups[]=ALL-ACTIVE&RR=4000&DB=0&adastats=&SIPmonitorLINK=&IAXmonitorLINK=&usergroup=&UGdisplay=1&UidORname=1&orderby=timeup&SERVdisplay=0&CALLSdisplay=1&PHONEdisplay=0&CUSTPHONEdisplay=0&with_inbound=Y&monitor_active=&monitor_phone=350a&ALLINGROUPstats=1&DROPINGROUPstats=0&NOLEADSalert=&CARRIERstats=1 + ##### INBOUND ONLY ### if (ereg('O',$with_inbound)) { @@ -1272,6 +1464,7 @@ else echo ""; echo "$DROPINGROUPstatsHTML\n"; + echo "$CARRIERstatsHTML\n"; } echo ""; @@ -1292,60 +1485,60 @@ echo "$ingroup_detail"; if ($adastats<2) { - echo "+ VIEW MORE"; + echo "+ VIEW MORE"; } else { - echo "+ VIEW LESS"; + echo "+ VIEW LESS"; } if ($UGdisplay>0) { - echo "       PIEL GRUPO DE USUARIOS"; + echo "       PIEL GRUPO DE USUARIOS"; } else { - echo "       VIEW GRUPO DE USUARIOS"; + echo "       VIEW GRUPO DE USUARIOS"; } if ($SERVdisplay>0) { - echo "       PIEL SERVIDOR INFO"; + echo "       PIEL SERVIDOR INFO"; } else { - echo "       DEMOSTRACIÓN SERVIDOR INFO"; + echo "       DEMOSTRACIÓN SERVIDOR INFO"; } if ($CALLSdisplay>0) { - echo "       PIEL WAITING CALLS"; + echo "       PIEL WAITING CALLS"; } else { - echo "       DEMOSTRACIÓN WAITING CALLS"; + echo "       DEMOSTRACIÓN WAITING CALLS"; } if ($ALLINGROUPstats>0) { - echo "       PIEL IN-GROUP STATS"; + echo "       PIEL IN-GROUP STATS"; } else { - echo "       DEMOSTRACIÓN IN-GROUP STATS"; + echo "       DEMOSTRACIÓN IN-GROUP STATS"; } if ($PHONEdisplay>0) { - echo "       PIEL PHONES"; + echo "       PIEL PHONES"; } else { - echo "       DEMOSTRACIÓN PHONES"; + echo "       DEMOSTRACIÓN PHONES"; } if ($CUSTPHONEdisplay>0) { - echo "       PIEL CUSTPHONES"; + echo "       PIEL CUSTPHONES"; } else { - echo "       DEMOSTRACIÓN CUSTPHONES"; + echo "       DEMOSTRACIÓN CUSTPHONES"; } echo ""; echo ""; @@ -1390,6 +1583,20 @@ if ( ($with_inbound != 'O') and ($NOLEADSalert == 'YES') ) ################################################################################### if ($campaign_allow_inbound > 0) { + if (eregi('ALL-ACTIVE',$group_string)) + { + $stmt="select closer_campaigns from vicidial_campaigns $group_SQLwhere"; + $rslt=mysql_query($stmt, $link); + $closer_campaigns=""; + while ($row=mysql_fetch_row($rslt)) + { + $closer_campaigns.="$row[0]"; + } + $closer_campaigns = preg_replace("/^ | -$/","",$closer_campaigns); + $closer_campaigns = preg_replace("/ - /"," ",$closer_campaigns); + $closer_campaigns = preg_replace("/ /","','",$closer_campaigns); + $closer_campaignsSQL = "'$closer_campaigns'"; + } $stmtB="from vicidial_auto_calls where status NOT IN('XFER') and ( (call_type='IN' and campaign_id IN($closer_campaignsSQL)) or (call_type IN('OUT','OUTBALANCE') $group_SQLand) ) order by queue_priority desc,campaign_id,call_time;"; } else @@ -1589,25 +1796,25 @@ $HTbegin = "|"; $HDstation = "----------------+"; $HTstation = " STATION |"; $HDphone = "-------------+"; -$HTphone = " PHONE |"; +$HTphone = " PHONE |"; $HDuser = "------------------------+"; -$HTuser = " USER "; +$HTuser = " USER "; if ($UidORname>0) { - $HTuser .= "DEMOSTRACIÓN ID "; + $HTuser .= "DEMOSTRACIÓN ID "; } else { - $HTuser .= "DEMOSTRACIÓN NAME"; + $HTuser .= "DEMOSTRACIÓN NAME"; } $HTuser .= " INFO |"; $HDusergroup = "--------------+"; -$HTusergroup = " GRUPO DE USUARIOS |"; +$HTusergroup = " GRUPO DE USUARIOS |"; $HDsessionid = "------------------+"; $HTsessionid = " SESSIONID |"; $HDbarge = "-------+"; @@ -1621,9 +1828,9 @@ $HTserver_ip = " SERVIDOR IP |"; $HDcall_server_ip = "-----------------+"; $HTcall_server_ip = " CALL SERVIDOR IP |"; $HDtime = "---------+"; -$HTtime = " MM:SS |"; +$HTtime = " MM:SS |"; $HDcampaign = "------------+"; -$HTcampaign = " CAMPAIGN |"; +$HTcampaign = " CAMPAIGN |"; $HDcalls = "-------+"; $HTcalls = " CALLS |"; $HDpause = ''; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/admin.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/admin.php index 0d099554..3f91495f 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/admin.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/admin.php @@ -2046,11 +2046,12 @@ else # 100103-0727 - Added Start/Dispo call url, 3/4/5 conf number presets, Lists conf-number overrides # 100104-1454 - Fixed in-group/campaign copy duplication issue # 100116-0718 - Added presets to script select list +# 100319-1708 - Changed user/pass for users to 20 characters in length, highlighted conf file secret in phones # # 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.2.0-234'; -$build = '100116-0718'; +$admin_version = '2.2.0-235'; +$build = '100319-1708'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -6398,9 +6399,9 @@ if ($ADD=="1") } else { - echo "\n"; + echo "\n"; } - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; + echo "\n"; } - echo "\n"; + echo "\n"; echo "\n"; if ($LOGuser_level==9) {$levelMAX=10;} @@ -8018,10 +8019,10 @@ if ($ADD=="2") { $user = 'AUTOGENERA'; } - if ( (strlen($user) < 2) or (strlen($pass) < 2) or (strlen($full_name) < 2) or (strlen($user_group) < 2) or ( (strlen($user) > 10) and (!ereg('AUTOGENERA',$user)) ) ) + if ( (strlen($user) < 2) or (strlen($pass) < 2) or (strlen($full_name) < 2) or (strlen($user_group) < 2) or ( (strlen($user) > 20) and (!ereg('AUTOGENERA',$user)) ) ) { echo "
USUARIO NO AGREGADO - vaya por favor detrás y mire los datos que usted incorporó\n"; - echo "
user id must be between 2 and 10 characters long\n"; + echo "
user id must be between 2 and 20 characters long\n"; echo "
el nombre completo y la contraseña deben ser por lo menos 2 caracteres de largo\n"; echo "
usted debe seleccionar un grupo de usuarios\n"; } @@ -8296,10 +8297,10 @@ if ($ADD=="2A") {echo "
USUARIO NO AGREGADO - hay ya un usuario en el sistema con este número del usuario\n";} else { - if ( (strlen($user) < 2) or (strlen($pass) < 2) or (strlen($full_name) < 2) or (strlen($user) > 10) ) + if ( (strlen($user) < 2) or (strlen($pass) < 2) or (strlen($full_name) < 2) or (strlen($user) > 20) ) { echo "
USUARIO NO AGREGADO - vaya por favor detrás y mire los datos que usted incorporó\n"; - echo "
user id must be between 2 and 10 characters long\n"; + echo "
user id must be between 2 and 20 characters long\n"; echo "
el nombre completo y la contraseña deben ser por lo menos 2 caracteres de largo\n"; echo "\n"; } @@ -20373,7 +20374,7 @@ if ($ADD==31111) echo "\n"; echo "\n"; echo "
\n"; @@ -743,9 +776,9 @@ echo "\n"; echo "\n"; echo "   "; echo "\n"; -echo "STOP | "; -echo "SLOW | "; -echo "GO"; +echo "STOP | "; +echo "SLOW | "; +echo "GO"; if (eregi('ALL-ACTIVE',$group_string)) { echo "       MODIFICAR | \n"; @@ -936,6 +969,7 @@ if ( ($DROPINGROUPstats > 0) and (!preg_match("/ALL-ACTIVE/",$group_string)) ) $dtp++; } $DIGcampaigns = preg_replace("/,$/",'',$DIGcampaigns); + if (strlen($DIGcampaigns) < 2) {$DIGcampaigns = "''";} $stmtB="select sum(calls_today),sum(drops_today),sum(answers_today) from vicidial_campaign_stats where campaign_id IN($DIGcampaigns);"; if ($DB > 0) {echo "\n|$stmtB|\n";} @@ -963,6 +997,164 @@ if ( ($DROPINGROUPstats > 0) and (!preg_match("/ALL-ACTIVE/",$group_string)) ) } +##### CARRIER STATS TOTALS ### +$CARRIERstatsHTML=''; +if ($CARRIERstats > 0) + { + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeTWENTYFOURhoursAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $car_to_print = mysql_num_rows($rslt); + $ctp=0; + while ($car_to_print > $ctp) + { + $row=mysql_fetch_row($rslt); + $TFhour_status[$ctp] = $row[0]; + $TFhour_count[$ctp] = $row[1]; + $dialstatuses .= "'$row[0]',"; + $ctp++; + } + $dialstatuses = preg_replace("/,$/",'',$dialstatuses); + + $CARRIERstatsHTML .= "
"; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + + if (strlen($dialstatuses) > 1) + { + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeSIXhoursAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$SIXhour_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeONEhourAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$ONEhour_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeFIFTEENminutesAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$FTminute_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeFIVEminutesAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$FIVEminute_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeONEminuteAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$ONEminute_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + + $print_ctp=0; + while ($print_ctp < $ctp) + { + if (strlen($TFhour_count[$print_ctp])<1) {$TFhour_count[$print_ctp]=0;} + if (strlen($SIXhour_count[$print_ctp])<1) {$SIXhour_count[$print_ctp]=0;} + if (strlen($ONEhour_count[$print_ctp])<1) {$ONEhour_count[$print_ctp]=0;} + if (strlen($FTminute_count[$print_ctp])<1) {$FTminute_count[$print_ctp]=0;} + if (strlen($FIVEminute_count[$print_ctp])<1) {$FIVEminute_count[$print_ctp]=0;} + if (strlen($ONEminute_count[$print_ctp])<1) {$ONEminute_count[$print_ctp]=0;} + + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $print_ctp++; + } + } + else + { + $CARRIERstatsHTML .= ""; + } + $CARRIERstatsHTML .= "
CARRIER STATS:                 HANGUP STATUS     24 HOURS     6 HOURS     1 HOUR     15 MIN     5 MIN     1 MIN  
     $TFhour_status[$print_ctp] $TFhour_count[$print_ctp] $SIXhour_count[$print_ctp] $ONEhour_count[$print_ctp] $FTminute_count[$print_ctp] $FIVEminute_count[$print_ctp] $ONEminute_count[$print_ctp]
no log entries
"; + $CARRIERstatsHTML .= "
NÚmero De Usuario: $NWB#vicidial_users-user$NWE
NÚmero De Usuario: $NWB#vicidial_users-user$NWE
Contraseña: $NWB#vicidial_users-pass$NWE
Contraseña: $NWB#vicidial_users-pass$NWE
Nombre Completo: $NWB#vicidial_users-full_name$NWE
Nivel Del Usuario:
NÚmero De Usuario: $NWB#vicidial_users-user$NWE
NÚmero De Usuario: $NWB#vicidial_users-user$NWE
Contraseña: $NWB#vicidial_users-pass$NWE
Contraseña: $NWB#vicidial_users-pass$NWE
Nombre Completo: $NWB#vicidial_users-full_name$NWE
\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/dbconnect.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/dbconnect.php index dca45485..ca505cc0 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/dbconnect.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/dbconnect.php @@ -4,47 +4,48 @@ # # database connection settings and some global web settings # -# Copyright (C) 2009 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # if ( file_exists("/etc/astguiclient.conf") ) -{ -$DBCagc = file("/etc/astguiclient.conf"); -foreach ($DBCagc as $DBCline) { - $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); - if (ereg("^PATHlogs", $DBCline)) - {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} - if (ereg("^PATHweb", $DBCline)) - {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} - if (ereg("^VARserver_ip", $DBCline)) - {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} - if (ereg("^VARDB_server", $DBCline)) - {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} - if (ereg("^VARDB_database", $DBCline)) - {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} - if (ereg("^VARDB_user", $DBCline)) - {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} - if (ereg("^VARDB_pass", $DBCline)) - {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} - if (ereg("^VARDB_port", $DBCline)) - {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + $DBCagc = file("/etc/astguiclient.conf"); + foreach ($DBCagc as $DBCline) + { + $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); + if (ereg("^PATHlogs", $DBCline)) + {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} + if (ereg("^PATHweb", $DBCline)) + {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} + if (ereg("^VARserver_ip", $DBCline)) + {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} + if (ereg("^VARDB_server", $DBCline)) + {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} + if (ereg("^VARDB_database", $DBCline)) + {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} + if (ereg("^VARDB_user", $DBCline)) + {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} + if (ereg("^VARDB_pass", $DBCline)) + {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} + if (ereg("^VARDB_port", $DBCline)) + {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + } + } +else + { + #defaults for DB connection + $VARDB_server = 'localhost'; + $VARDB_port = '3306'; + $VARDB_user = 'cron'; + $VARDB_pass = '1234'; + $VARDB_database = '1234'; + $WeBServeRRooT = '/usr/local/apache2/htdocs'; } -} -else -{ -#defaults for DB connection -$VARDB_server = 'localhost'; -$VARDB_user = 'cron'; -$VARDB_pass = '1234'; -$VARDB_database = '1234'; -$WeBServeRRooT = '/usr/local/apache2/htdocs'; -} - -$link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass"); -if (!$link) { +$link=mysql_connect("$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass"); +if (!$link) + { die('MySQL connect ERROR: ' . mysql_error()); -} + } mysql_select_db("$VARDB_database"); $local_DEF = 'Local/'; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/new_listloader_superL.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/new_listloader_superL.php index 9f797cd2..36c8386a 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/new_listloader_superL.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/new_listloader_superL.php @@ -1638,7 +1638,7 @@ exit; function lookup_gmt($phone_code,$USarea,$state,$LOCAL_GMT_OFF_STD,$Shour,$Smin,$Ssec,$Smon,$Smday,$Syear,$postalgmt,$postal_code) { -require("dbconnect.php"); +global $link; $postalgmt_found=0; if ( (eregi("POSTAL",$postalgmt)) && (strlen($postal_code)>4) ) diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/AST_agent_status_detail.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/AST_agent_status_detail.php index b7c4e575..23cbd084 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/AST_agent_status_detail.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/AST_agent_status_detail.php @@ -338,7 +338,7 @@ else { $Suser=$usersARY[$m]; $Sfull_name=$user_namesARY[$m]; - $Scalls=$calls[$m]; + $Scalls=0; $SstatusesHTML=''; $SstatusesFILE=''; $CIScount=0; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/AST_timeonVDADall.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/AST_timeonVDADall.php index 6e277ac1..5bf977e0 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/AST_timeonVDADall.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/AST_timeonVDADall.php @@ -60,10 +60,11 @@ # 91204-1548 - Added ability to change agent in-groups and blended # 100214-1127 - Added no-dialable-leads alert and in-groups stats option # 100301-1229 - Added 3-WAY status for consultative transfer agents +# 100303-0930 - Added carrier stats display option # -$version = '2.2.0-51'; -$build = '100301-1229'; +$version = '2.2.0-52'; +$build = '100303-0930'; header ("Content-type: text/html; charset=utf-8"); @@ -123,6 +124,8 @@ if (isset($_GET["monitor_active"])) {$monitor_active=$_GET["monitor_active"]; elseif (isset($_POST["monitor_active"])) {$monitor_active=$_POST["monitor_active"];} if (isset($_GET["monitor_phone"])) {$monitor_phone=$_GET["monitor_phone"];} elseif (isset($_POST["monitor_phone"])) {$monitor_phone=$_POST["monitor_phone"];} +if (isset($_GET["CARRIERstats"])) {$CARRIERstats=$_GET["CARRIERstats"];} + elseif (isset($_POST["CARRIERstats"])) {$CARRIERstats=$_POST["CARRIERstats"];} ############################################# @@ -155,7 +158,7 @@ if (!isset($PAUSEcodes)) {$PAUSEcodes='N';} # 0=no, 1=yes if (!isset($with_inbound)) { if ($outbound_autodial_active > 0) - {$with_inbound='N';} # N=no, Y=yes, O=only + {$with_inbound='Y';} # N=no, Y=yes, O=only else {$with_inbound='O';} # N=no, Y=yes, O=only } @@ -216,8 +219,18 @@ $NOW_TIME = date("Y-m-d H:i:s"); $NOW_DAY = date("Y-m-d"); $NOW_HOUR = date("H:i:s"); $STARTtime = date("U"); +$epochONEminuteAGO = ($STARTtime - 60); +$timeONEminuteAGO = date("Y-m-d H:i:s",$epochONEminuteAGO); +$epochFIVEminutesAGO = ($STARTtime - 300); +$timeFIVEminutesAGO = date("Y-m-d H:i:s",$epochFIVEminutesAGO); +$epochFIFTEENminutesAGO = ($STARTtime - 900); +$timeFIFTEENminutesAGO = date("Y-m-d H:i:s",$epochFIFTEENminutesAGO); +$epochONEhourAGO = ($STARTtime - 3600); +$timeONEhourAGO = date("Y-m-d H:i:s",$epochONEhourAGO); $epochSIXhoursAGO = ($STARTtime - 21600); $timeSIXhoursAGO = date("Y-m-d H:i:s",$epochSIXhoursAGO); +$epochTWENTYFOURhoursAGO = ($STARTtime - 86400); +$timeTWENTYFOURhoursAGO = date("Y-m-d H:i:s",$epochTWENTYFOURhoursAGO); $PHP_AUTH_USER = ereg_replace("[^0-9a-zA-Z]","",$PHP_AUTH_USER); @@ -325,7 +338,7 @@ $NFB = ''; $NFE = ''; $F=''; $FG=''; $B=''; $BG=''; -$select_list = "
Comienzo Del ID del usuario: (Solamente números, incremented)$NWB#vicidial_remote_agents-user_start$NWE
Comienzo Del ID del usuario: (Solamente números, incremented)$NWB#vicidial_remote_agents-user_start$NWE
Número de líneas: (Solamente números)$NWB#vicidial_remote_agents-number_of_lines$NWE
IP Del Servidor:
Exten de VmaiDumpl: $NWB#phones-voicemail_dump_exten$NWE
Contexto De Exten: $NWB#phones-ext_context$NWE
Teléfono Contexto: $NWB#phones-phone_context$NWE
Conf. Archivo Secreto: $NWB#phones-conf_secret$NWE
Conf. Archivo Secreto: $NWB#phones-conf_secret$NWE
Canal de envío del DTMF: $NWB#phones-dtmf_send_extension$NWE
Grupo de las llamadas de salida: $NWB#phones-call_out_number_group$NWE
Localización del Navegador: $NWB#phones-client_browser$NWE
Select Campagnes:
"; +$select_list = "
Select Campagnes:
"; $select_list .= ""; $select_list .= "
(Pour sélectionner plus de 1 campagne, maintenez la touche Ctrl enfoncée et cliquez sur)"; $select_list .= "		"; $select_list .= "Fermer le panneau

"; +$select_list .= ""; -if ($UGdisplay > 0) - { - $select_list .= "Select Groupe utilisateur:
"; - $select_list .= "

"; - } - -$select_list .= "   Inbound: "; +$select_list .= ""; -$select_list .= "   Dialable Leads Alert:
"; + } + +$select_list .= ""; $select_list .= ""; -$select_list .= "
"; +$select_list .= "Inbound:
 
"; + $select_list .= "Select Groupe utilisateur: "; + $select_list .= "
"; +$select_list .= "Dialable Leads Alert:
"; $select_list .= "   "; $select_list .= ""; +$select_list .= ""; $select_list .= "VERSION: $version   CONSTRUCTION: $build"; $select_list .= "
"; @@ -707,7 +739,7 @@ $rslt=mysql_query($stmt, $link); $campaign_allow_inbound = $row[0]; echo "\n"; -echo"\n"; +echo"\n"; echo "Real-Time Report: $group\n"; $short_header=1; @@ -734,6 +766,7 @@ echo "\n"; echo "\n"; echo "\n"; echo "\n"; +echo "\n"; echo "Real-Time Report                                                                               \n"; echo "\n"; echo ""; + } + +# http://svn.eflo.net:40080/vicidial/AST_timeonVDADall.php?&groups[]=ALL-ACTIVE&RR=4000&DB=0&adastats=&SIPmonitorLINK=&IAXmonitorLINK=&usergroup=&UGdisplay=1&UidORname=1&orderby=timeup&SERVdisplay=0&CALLSdisplay=1&PHONEdisplay=0&CUSTPHONEdisplay=0&with_inbound=Y&monitor_active=&monitor_phone=350a&ALLINGROUPstats=1&DROPINGROUPstats=0&NOLEADSalert=&CARRIERstats=1 + ##### INBOUND ONLY ### if (ereg('O',$with_inbound)) { @@ -1272,6 +1464,7 @@ else echo ""; echo "$DROPINGROUPstatsHTML\n"; + echo "$CARRIERstatsHTML\n"; } echo ""; @@ -1292,60 +1485,60 @@ echo "$ingroup_detail"; if ($adastats<2) { - echo "+ VIEW MORE"; + echo "+ VIEW MORE"; } else { - echo "+ VIEW LESS"; + echo "+ VIEW LESS"; } if ($UGdisplay>0) { - echo "       CACHER GROUPE D'UTILISATEURS"; + echo "       CACHER GROUPE D'UTILISATEURS"; } else { - echo "       VIEW GROUPE D'UTILISATEURS"; + echo "       VIEW GROUPE D'UTILISATEURS"; } if ($SERVdisplay>0) { - echo "       CACHER SERVEUR INFO"; + echo "       CACHER SERVEUR INFO"; } else { - echo "       MONTRER SERVEUR INFO"; + echo "       MONTRER SERVEUR INFO"; } if ($CALLSdisplay>0) { - echo "       CACHER WAITING CALLS"; + echo "       CACHER WAITING CALLS"; } else { - echo "       MONTRER WAITING CALLS"; + echo "       MONTRER WAITING CALLS"; } if ($ALLINGROUPstats>0) { - echo "       CACHER IN-GROUP STATS"; + echo "       CACHER IN-GROUP STATS"; } else { - echo "       MONTRER IN-GROUP STATS"; + echo "       MONTRER IN-GROUP STATS"; } if ($PHONEdisplay>0) { - echo "       CACHER PHONES"; + echo "       CACHER PHONES"; } else { - echo "       MONTRER PHONES"; + echo "       MONTRER PHONES"; } if ($CUSTPHONEdisplay>0) { - echo "       CACHER CUSTPHONES"; + echo "       CACHER CUSTPHONES"; } else { - echo "       MONTRER CUSTPHONES"; + echo "       MONTRER CUSTPHONES"; } echo ""; echo ""; @@ -1390,6 +1583,20 @@ if ( ($with_inbound != 'O') and ($NOLEADSalert == 'YES') ) ################################################################################### if ($campaign_allow_inbound > 0) { + if (eregi('ALL-ACTIVE',$group_string)) + { + $stmt="select closer_campaigns from vicidial_campaigns $group_SQLwhere"; + $rslt=mysql_query($stmt, $link); + $closer_campaigns=""; + while ($row=mysql_fetch_row($rslt)) + { + $closer_campaigns.="$row[0]"; + } + $closer_campaigns = preg_replace("/^ | -$/","",$closer_campaigns); + $closer_campaigns = preg_replace("/ - /"," ",$closer_campaigns); + $closer_campaigns = preg_replace("/ /","','",$closer_campaigns); + $closer_campaignsSQL = "'$closer_campaigns'"; + } $stmtB="from vicidial_auto_calls where status NOT IN('XFER') and ( (call_type='IN' and campaign_id IN($closer_campaignsSQL)) or (call_type IN('OUT','OUTBALANCE') $group_SQLand) ) order by queue_priority desc,campaign_id,call_time;"; } else @@ -1589,25 +1796,25 @@ $HTbegin = "|"; $HDstation = "----------------+"; $HTstation = " STATION |"; $HDphone = "-------------+"; -$HTphone = " PHONE |"; +$HTphone = " PHONE |"; $HDuser = "------------------------+"; -$HTuser = " USER "; +$HTuser = " USER "; if ($UidORname>0) { - $HTuser .= "MONTRER ID "; + $HTuser .= "MONTRER ID "; } else { - $HTuser .= "MONTRER NAME"; + $HTuser .= "MONTRER NAME"; } $HTuser .= " INFO |"; $HDusergroup = "--------------+"; -$HTusergroup = " GROUPE D'UTILISATEURS |"; +$HTusergroup = " GROUPE D'UTILISATEURS |"; $HDsessionid = "------------------+"; $HTsessionid = " SESSIONID |"; $HDbarge = "-------+"; @@ -1621,9 +1828,9 @@ $HTserver_ip = " SERVEUR IP |"; $HDcall_server_ip = "-----------------+"; $HTcall_server_ip = " CALL SERVEUR IP |"; $HDtime = "---------+"; -$HTtime = " MM:SS |"; +$HTtime = " MM:SS |"; $HDcampaign = "------------+"; -$HTcampaign = " CAMPAIGN |"; +$HTcampaign = " CAMPAIGN |"; $HDcalls = "-------+"; $HTcalls = " CALLS |"; $HDpause = ''; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/admin.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/admin.php index 8548dd1a..bcd0c095 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/admin.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/admin.php @@ -2046,11 +2046,12 @@ else # 100103-0727 - Added Start/Dispo call url, 3/4/5 conf number presets, Lists conf-number overrides # 100104-1454 - Fixed in-group/campaign copy duplication issue # 100116-0718 - Added presets to script select list +# 100319-1708 - Changed user/pass for users to 20 characters in length, highlighted conf file secret in phones # # 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.2.0-234'; -$build = '100116-0718'; +$admin_version = '2.2.0-235'; +$build = '100319-1708'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -6398,9 +6399,9 @@ if ($ADD=="1") } else { - echo "\n"; + echo "\n"; } - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; + echo "\n"; } - echo "\n"; + echo "\n"; echo "\n"; if ($LOGuser_level==9) {$levelMAX=10;} @@ -8018,10 +8019,10 @@ if ($ADD=="2") { $user = 'AUTOGENERA'; } - if ( (strlen($user) < 2) or (strlen($pass) < 2) or (strlen($full_name) < 2) or (strlen($user_group) < 2) or ( (strlen($user) > 10) and (!ereg('AUTOGENERA',$user)) ) ) + if ( (strlen($user) < 2) or (strlen($pass) < 2) or (strlen($full_name) < 2) or (strlen($user_group) < 2) or ( (strlen($user) > 20) and (!ereg('AUTOGENERA',$user)) ) ) { echo "
UTILISATEUR NON AJOUTE - Veuillez revenir en arrière et vérifier les données que vous avez saisies\n"; - echo "
user id must be between 2 and 10 characters long\n"; + echo "
user id must be between 2 and 20 characters long\n"; echo "
le nom et le mot de passe doivent contenir au moins 2 caractères\n"; echo "
Vous devez sélectionner un groupe d-utilisateurs\n"; } @@ -8296,10 +8297,10 @@ if ($ADD=="2A") {echo "
UTILISATEUR NON AJOUTE - il y a déjà un utilisateur dans le système avec ce numéro d'utilisateur\n";} else { - if ( (strlen($user) < 2) or (strlen($pass) < 2) or (strlen($full_name) < 2) or (strlen($user) > 10) ) + if ( (strlen($user) < 2) or (strlen($pass) < 2) or (strlen($full_name) < 2) or (strlen($user) > 20) ) { echo "
UTILISATEUR NON AJOUTE - Veuillez revenir en arrière et vérifier les données que vous avez saisies\n"; - echo "
user id must be between 2 and 10 characters long\n"; + echo "
user id must be between 2 and 20 characters long\n"; echo "
le nom et le mot de passe doivent contenir au moins 2 caractères\n"; echo "\n"; } @@ -20373,7 +20374,7 @@ if ($ADD==31111) echo "\n"; echo "\n"; echo "
\n"; @@ -743,9 +776,9 @@ echo "\n"; echo "\n"; echo "   "; echo "\n"; -echo "STOP | "; -echo "SLOW | "; -echo "GO"; +echo "STOP | "; +echo "SLOW | "; +echo "GO"; if (eregi('ALL-ACTIVE',$group_string)) { echo "       MODIFIER | \n"; @@ -936,6 +969,7 @@ if ( ($DROPINGROUPstats > 0) and (!preg_match("/ALL-ACTIVE/",$group_string)) ) $dtp++; } $DIGcampaigns = preg_replace("/,$/",'',$DIGcampaigns); + if (strlen($DIGcampaigns) < 2) {$DIGcampaigns = "''";} $stmtB="select sum(calls_today),sum(drops_today),sum(answers_today) from vicidial_campaign_stats where campaign_id IN($DIGcampaigns);"; if ($DB > 0) {echo "\n|$stmtB|\n";} @@ -963,6 +997,164 @@ if ( ($DROPINGROUPstats > 0) and (!preg_match("/ALL-ACTIVE/",$group_string)) ) } +##### CARRIER STATS TOTALS ### +$CARRIERstatsHTML=''; +if ($CARRIERstats > 0) + { + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeTWENTYFOURhoursAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $car_to_print = mysql_num_rows($rslt); + $ctp=0; + while ($car_to_print > $ctp) + { + $row=mysql_fetch_row($rslt); + $TFhour_status[$ctp] = $row[0]; + $TFhour_count[$ctp] = $row[1]; + $dialstatuses .= "'$row[0]',"; + $ctp++; + } + $dialstatuses = preg_replace("/,$/",'',$dialstatuses); + + $CARRIERstatsHTML .= "
"; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + + if (strlen($dialstatuses) > 1) + { + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeSIXhoursAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$SIXhour_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeONEhourAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$ONEhour_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeFIFTEENminutesAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$FTminute_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeFIVEminutesAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$FIVEminute_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeONEminuteAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$ONEminute_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + + $print_ctp=0; + while ($print_ctp < $ctp) + { + if (strlen($TFhour_count[$print_ctp])<1) {$TFhour_count[$print_ctp]=0;} + if (strlen($SIXhour_count[$print_ctp])<1) {$SIXhour_count[$print_ctp]=0;} + if (strlen($ONEhour_count[$print_ctp])<1) {$ONEhour_count[$print_ctp]=0;} + if (strlen($FTminute_count[$print_ctp])<1) {$FTminute_count[$print_ctp]=0;} + if (strlen($FIVEminute_count[$print_ctp])<1) {$FIVEminute_count[$print_ctp]=0;} + if (strlen($ONEminute_count[$print_ctp])<1) {$ONEminute_count[$print_ctp]=0;} + + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $print_ctp++; + } + } + else + { + $CARRIERstatsHTML .= ""; + } + $CARRIERstatsHTML .= "
CARRIER STATS:                 HANGUP STATUS     24 HOURS     6 HOURS     1 HOUR     15 MIN     5 MIN     1 MIN  
     $TFhour_status[$print_ctp] $TFhour_count[$print_ctp] $SIXhour_count[$print_ctp] $ONEhour_count[$print_ctp] $FTminute_count[$print_ctp] $FIVEminute_count[$print_ctp] $ONEminute_count[$print_ctp]
no log entries
"; + $CARRIERstatsHTML .= "
Numéro d'utilisateur : $NWB#vicidial_users-user$NWE
Numéro d'utilisateur : $NWB#vicidial_users-user$NWE
Mot de passe:$NWB#vicidial_users-pass$NWE
Mot de passe:$NWB#vicidial_users-pass$NWE
Nom complet: $NWB#vicidial_users-full_name$NWE
Niveau de l'utilisateur:
Numéro d'utilisateur : $NWB#vicidial_users-user$NWE
Numéro d'utilisateur : $NWB#vicidial_users-user$NWE
Mot de passe:$NWB#vicidial_users-pass$NWE
Mot de passe:$NWB#vicidial_users-pass$NWE
Nom complet: $NWB#vicidial_users-full_name$NWE
\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/dbconnect.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/dbconnect.php index dca45485..ca505cc0 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/dbconnect.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/dbconnect.php @@ -4,47 +4,48 @@ # # database connection settings and some global web settings # -# Copyright (C) 2009 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # if ( file_exists("/etc/astguiclient.conf") ) -{ -$DBCagc = file("/etc/astguiclient.conf"); -foreach ($DBCagc as $DBCline) { - $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); - if (ereg("^PATHlogs", $DBCline)) - {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} - if (ereg("^PATHweb", $DBCline)) - {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} - if (ereg("^VARserver_ip", $DBCline)) - {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} - if (ereg("^VARDB_server", $DBCline)) - {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} - if (ereg("^VARDB_database", $DBCline)) - {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} - if (ereg("^VARDB_user", $DBCline)) - {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} - if (ereg("^VARDB_pass", $DBCline)) - {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} - if (ereg("^VARDB_port", $DBCline)) - {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + $DBCagc = file("/etc/astguiclient.conf"); + foreach ($DBCagc as $DBCline) + { + $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); + if (ereg("^PATHlogs", $DBCline)) + {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} + if (ereg("^PATHweb", $DBCline)) + {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} + if (ereg("^VARserver_ip", $DBCline)) + {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} + if (ereg("^VARDB_server", $DBCline)) + {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} + if (ereg("^VARDB_database", $DBCline)) + {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} + if (ereg("^VARDB_user", $DBCline)) + {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} + if (ereg("^VARDB_pass", $DBCline)) + {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} + if (ereg("^VARDB_port", $DBCline)) + {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + } + } +else + { + #defaults for DB connection + $VARDB_server = 'localhost'; + $VARDB_port = '3306'; + $VARDB_user = 'cron'; + $VARDB_pass = '1234'; + $VARDB_database = '1234'; + $WeBServeRRooT = '/usr/local/apache2/htdocs'; } -} -else -{ -#defaults for DB connection -$VARDB_server = 'localhost'; -$VARDB_user = 'cron'; -$VARDB_pass = '1234'; -$VARDB_database = '1234'; -$WeBServeRRooT = '/usr/local/apache2/htdocs'; -} - -$link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass"); -if (!$link) { +$link=mysql_connect("$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass"); +if (!$link) + { die('MySQL connect ERROR: ' . mysql_error()); -} + } mysql_select_db("$VARDB_database"); $local_DEF = 'Local/'; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/new_listloader_superL.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/new_listloader_superL.php index 3d489dad..3f9c1fc8 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/new_listloader_superL.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/new_listloader_superL.php @@ -1638,7 +1638,7 @@ exit; function lookup_gmt($phone_code,$USarea,$state,$LOCAL_GMT_OFF_STD,$Shour,$Smin,$Ssec,$Smon,$Smday,$Syear,$postalgmt,$postal_code) { -require("dbconnect.php"); +global $link; $postalgmt_found=0; if ( (eregi("POSTAL",$postalgmt)) && (strlen($postal_code)>4) ) diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/AST_agent_status_detail.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/AST_agent_status_detail.php index 2eac0fc5..930baa93 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/AST_agent_status_detail.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/AST_agent_status_detail.php @@ -338,7 +338,7 @@ else { $Suser=$usersARY[$m]; $Sfull_name=$user_namesARY[$m]; - $Scalls=$calls[$m]; + $Scalls=0; $SstatusesHTML=''; $SstatusesFILE=''; $CIScount=0; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/AST_timeonVDADall.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/AST_timeonVDADall.php index 45af0097..9167b749 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/AST_timeonVDADall.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/AST_timeonVDADall.php @@ -60,10 +60,11 @@ # 91204-1548 - Added ability to change agent in-groups and blended # 100214-1127 - Added no-dialable-leads alert and in-groups stats option # 100301-1229 - Added 3-WAY status for consultative transfer agents +# 100303-0930 - Added carrier stats display option # -$version = '2.2.0-51'; -$build = '100301-1229'; +$version = '2.2.0-52'; +$build = '100303-0930'; header ("Content-type: text/html; charset=utf-8"); @@ -123,6 +124,8 @@ if (isset($_GET["monitor_active"])) {$monitor_active=$_GET["monitor_active"]; elseif (isset($_POST["monitor_active"])) {$monitor_active=$_POST["monitor_active"];} if (isset($_GET["monitor_phone"])) {$monitor_phone=$_GET["monitor_phone"];} elseif (isset($_POST["monitor_phone"])) {$monitor_phone=$_POST["monitor_phone"];} +if (isset($_GET["CARRIERstats"])) {$CARRIERstats=$_GET["CARRIERstats"];} + elseif (isset($_POST["CARRIERstats"])) {$CARRIERstats=$_POST["CARRIERstats"];} ############################################# @@ -155,7 +158,7 @@ if (!isset($PAUSEcodes)) {$PAUSEcodes='N';} # 0=no, 1=yes if (!isset($with_inbound)) { if ($outbound_autodial_active > 0) - {$with_inbound='N';} # N=no, Y=yes, O=only + {$with_inbound='Y';} # N=no, Y=yes, O=only else {$with_inbound='O';} # N=no, Y=yes, O=only } @@ -216,8 +219,18 @@ $NOW_TIME = date("Y-m-d H:i:s"); $NOW_DAY = date("Y-m-d"); $NOW_HOUR = date("H:i:s"); $STARTtime = date("U"); +$epochONEminuteAGO = ($STARTtime - 60); +$timeONEminuteAGO = date("Y-m-d H:i:s",$epochONEminuteAGO); +$epochFIVEminutesAGO = ($STARTtime - 300); +$timeFIVEminutesAGO = date("Y-m-d H:i:s",$epochFIVEminutesAGO); +$epochFIFTEENminutesAGO = ($STARTtime - 900); +$timeFIFTEENminutesAGO = date("Y-m-d H:i:s",$epochFIFTEENminutesAGO); +$epochONEhourAGO = ($STARTtime - 3600); +$timeONEhourAGO = date("Y-m-d H:i:s",$epochONEhourAGO); $epochSIXhoursAGO = ($STARTtime - 21600); $timeSIXhoursAGO = date("Y-m-d H:i:s",$epochSIXhoursAGO); +$epochTWENTYFOURhoursAGO = ($STARTtime - 86400); +$timeTWENTYFOURhoursAGO = date("Y-m-d H:i:s",$epochTWENTYFOURhoursAGO); $PHP_AUTH_USER = ereg_replace("[^0-9a-zA-Z]","",$PHP_AUTH_USER); @@ -325,7 +338,7 @@ $NFB = ''; $NFE = ''; $F=''; $FG=''; $B=''; $BG=''; -$select_list = "
Début des ID utilisateurs: (nombres seulement, incremented)$NWB#vicidial_remote_agents-user_start$NWE
Début des ID utilisateurs: (nombres seulement, incremented)$NWB#vicidial_remote_agents-user_start$NWE
Nombre de lignes: (nombres seulement)$NWB#vicidial_remote_agents-number_of_lines$NWE
IP du serveur:
Extension de VmailDump: $NWB#phones-voicemail_dump_exten$NWE
Extension du context: $NWB#phones-ext_context$NWE
Téléphone Contexte: $NWB#phones-phone_context$NWE
Conf dossier secret: $NWB#phones-conf_secret$NWE
Conf dossier secret: $NWB#phones-conf_secret$NWE
Cannal d'envoi DTMF: $NWB#phones-dtmf_send_extension$NWE
Groupe d'appels sortants: $NWB#phones-call_out_number_group$NWE
Localisation du navigateur: $NWB#phones-client_browser$NWE
Select Campagnas:
"; +$select_list = "
Select Campagnas:
"; $select_list .= ""; $select_list .= "
(Per selezionare più di campagna 1, tenere premuto il tasto Ctrl e fare clic su)"; $select_list .= "		"; $select_list .= "Chiudi pannello

"; +$select_list .= ""; -if ($UGdisplay > 0) - { - $select_list .= "Select Gruppo Utente:
"; - $select_list .= "

"; - } - -$select_list .= "   Inbound: "; +$select_list .= ""; -$select_list .= "   Dialable Leads Alert:
"; + } + +$select_list .= ""; $select_list .= ""; -$select_list .= "
"; +$select_list .= "Inbound:
 
"; + $select_list .= "Select Gruppo Utente: "; + $select_list .= "
"; +$select_list .= "Dialable Leads Alert:
"; $select_list .= "   "; $select_list .= ""; +$select_list .= ""; $select_list .= "VERSIONE: $version   BUILD: $build"; $select_list .= "
"; @@ -707,7 +739,7 @@ $rslt=mysql_query($stmt, $link); $campaign_allow_inbound = $row[0]; echo "\n"; -echo"\n"; +echo"\n"; echo "Real-Time Report: $group\n"; $short_header=1; @@ -734,6 +766,7 @@ echo "\n"; echo "\n"; echo "\n"; echo "\n"; +echo "\n"; echo "Real-Time Report                                                                               \n"; echo "\n"; echo ""; + } + +# http://svn.eflo.net:40080/vicidial/AST_timeonVDADall.php?&groups[]=ALL-ACTIVE&RR=4000&DB=0&adastats=&SIPmonitorLINK=&IAXmonitorLINK=&usergroup=&UGdisplay=1&UidORname=1&orderby=timeup&SERVdisplay=0&CALLSdisplay=1&PHONEdisplay=0&CUSTPHONEdisplay=0&with_inbound=Y&monitor_active=&monitor_phone=350a&ALLINGROUPstats=1&DROPINGROUPstats=0&NOLEADSalert=&CARRIERstats=1 + ##### INBOUND ONLY ### if (ereg('O',$with_inbound)) { @@ -1272,6 +1464,7 @@ else echo ""; echo "$DROPINGROUPstatsHTML\n"; + echo "$CARRIERstatsHTML\n"; } echo ""; @@ -1292,60 +1485,60 @@ echo "$ingroup_detail"; if ($adastats<2) { - echo "+ VIEW MORE"; + echo "+ VIEW MORE"; } else { - echo "+ VIEW LESS"; + echo "+ VIEW LESS"; } if ($UGdisplay>0) { - echo "       NASCONDI GRUPPI UTENTI"; + echo "       NASCONDI GRUPPI UTENTI"; } else { - echo "       MOSTRA GRUPPI UTENTI"; + echo "       MOSTRA GRUPPI UTENTI"; } if ($SERVdisplay>0) { - echo "       NASCONDI INFO SERVER"; + echo "       NASCONDI INFO SERVER"; } else { - echo "       MOSTRA INFO SERVER"; + echo "       MOSTRA INFO SERVER"; } if ($CALLSdisplay>0) { - echo "       NASCONDI WAITING CALLS"; + echo "       NASCONDI WAITING CALLS"; } else { - echo "       MOSTRA WAITING CALLS"; + echo "       MOSTRA WAITING CALLS"; } if ($ALLINGROUPstats>0) { - echo "       NASCONDI IN-GROUP STATS"; + echo "       NASCONDI IN-GROUP STATS"; } else { - echo "       MOSTRA IN-GROUP STATS"; + echo "       MOSTRA IN-GROUP STATS"; } if ($PHONEdisplay>0) { - echo "       NASCONDI PHONES"; + echo "       NASCONDI PHONES"; } else { - echo "       MOSTRA PHONES"; + echo "       MOSTRA PHONES"; } if ($CUSTPHONEdisplay>0) { - echo "       NASCONDI CUSTPHONES"; + echo "       NASCONDI CUSTPHONES"; } else { - echo "       MOSTRA CUSTPHONES"; + echo "       MOSTRA CUSTPHONES"; } echo ""; echo ""; @@ -1390,6 +1583,20 @@ if ( ($with_inbound != 'O') and ($NOLEADSalert == 'YES') ) ################################################################################### if ($campaign_allow_inbound > 0) { + if (eregi('ALL-ACTIVE',$group_string)) + { + $stmt="select closer_campaigns from vicidial_campaigns $group_SQLwhere"; + $rslt=mysql_query($stmt, $link); + $closer_campaigns=""; + while ($row=mysql_fetch_row($rslt)) + { + $closer_campaigns.="$row[0]"; + } + $closer_campaigns = preg_replace("/^ | -$/","",$closer_campaigns); + $closer_campaigns = preg_replace("/ - /"," ",$closer_campaigns); + $closer_campaigns = preg_replace("/ /","','",$closer_campaigns); + $closer_campaignsSQL = "'$closer_campaigns'"; + } $stmtB="from vicidial_auto_calls where status NOT IN('XFER') and ( (call_type='IN' and campaign_id IN($closer_campaignsSQL)) or (call_type IN('OUT','OUTBALANCE') $group_SQLand) ) order by queue_priority desc,campaign_id,call_time;"; } else @@ -1589,25 +1796,25 @@ $HTbegin = "|"; $HDstation = "----------------+"; $HTstation = " STATION |"; $HDphone = "-------------+"; -$HTphone = " PHONE |"; +$HTphone = " PHONE |"; $HDuser = "------------------------+"; -$HTuser = " UTENTE "; +$HTuser = " UTENTE "; if ($UidORname>0) { - $HTuser .= "MOSTRA ID "; + $HTuser .= "MOSTRA ID "; } else { - $HTuser .= "MOSTRA NAME"; + $HTuser .= "MOSTRA NAME"; } $HTuser .= " INFO |"; $HDusergroup = "--------------+"; -$HTusergroup = " Utente Group |"; +$HTusergroup = " Utente Group |"; $HDsessionid = "------------------+"; $HTsessionid = " SESSIONID |"; $HDbarge = "-------+"; @@ -1621,9 +1828,9 @@ $HTserver_ip = " SERVER IP |"; $HDcall_server_ip = "-----------------+"; $HTcall_server_ip = " CALL SERVER IP |"; $HDtime = "---------+"; -$HTtime = " MM:SS |"; +$HTtime = " MM:SS |"; $HDcampaign = "------------+"; -$HTcampaign = " CAMPAGNA |"; +$HTcampaign = " CAMPAGNA |"; $HDcalls = "-------+"; $HTcalls = " CALLS |"; $HDpause = ''; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/admin.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/admin.php index 9cf6dcee..d9beda6e 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/admin.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/admin.php @@ -2046,11 +2046,12 @@ else # 100103-0727 - Added Start/Dispo call url, 3/4/5 conf number presets, Lists conf-number overrides # 100104-1454 - Fixed in-group/campaign copy duplication issue # 100116-0718 - Added presets to script select list +# 100319-1708 - Changed user/pass for users to 20 characters in length, highlighted conf file secret in phones # # 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.2.0-234'; -$build = '100116-0718'; +$admin_version = '2.2.0-235'; +$build = '100319-1708'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -6398,9 +6399,9 @@ if ($ADD=="1") } else { - echo "\n"; + echo "\n"; } - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; + echo "\n"; } - echo "\n"; + echo "\n"; echo "\n"; if ($LOGuser_level==9) {$levelMAX=10;} @@ -8018,10 +8019,10 @@ if ($ADD=="2") { $user = 'AUTOGENERA'; } - if ( (strlen($user) < 2) or (strlen($pass) < 2) or (strlen($full_name) < 2) or (strlen($user_group) < 2) or ( (strlen($user) > 10) and (!ereg('AUTOGENERA',$user)) ) ) + if ( (strlen($user) < 2) or (strlen($pass) < 2) or (strlen($full_name) < 2) or (strlen($user_group) < 2) or ( (strlen($user) > 20) and (!ereg('AUTOGENERA',$user)) ) ) { echo "
UTENTE NON AGGIUNTO - Per favore torna indietro e ricontrolla i dati inseriti\n"; - echo "
user id must be between 2 and 10 characters long\n"; + echo "
user id must be between 2 and 20 characters long\n"; echo "
il nome e la password devono essere lunghi almeno 2 caratteri\n"; echo "
è necessario selezionare un gruppo di utenti\n"; } @@ -8296,10 +8297,10 @@ if ($ADD=="2A") {echo "
UTENTE NON AGGIUNTO - Esiste gia` un utente nel sistema con questo numero utente\n";} else { - if ( (strlen($user) < 2) or (strlen($pass) < 2) or (strlen($full_name) < 2) or (strlen($user) > 10) ) + if ( (strlen($user) < 2) or (strlen($pass) < 2) or (strlen($full_name) < 2) or (strlen($user) > 20) ) { echo "
UTENTE NON AGGIUNTO - Per favore torna indietro e ricontrolla i dati inseriti\n"; - echo "
user id must be between 2 and 10 characters long\n"; + echo "
user id must be between 2 and 20 characters long\n"; echo "
il nome e la password devono essere lunghi almeno 2 caratteri\n"; echo "\n"; } @@ -20373,7 +20374,7 @@ if ($ADD==31111) echo "\n"; echo "\n"; echo "
\n"; @@ -743,9 +776,9 @@ echo "\n"; echo "\n"; echo "   "; echo "\n"; -echo "STOP | "; -echo "PIU LENTO | "; -echo "INIZIA"; +echo "STOP | "; +echo "PIU LENTO | "; +echo "INIZIA"; if (eregi('ALL-ACTIVE',$group_string)) { echo "       MODIFICA | \n"; @@ -936,6 +969,7 @@ if ( ($DROPINGROUPstats > 0) and (!preg_match("/ALL-ACTIVE/",$group_string)) ) $dtp++; } $DIGcampaigns = preg_replace("/,$/",'',$DIGcampaigns); + if (strlen($DIGcampaigns) < 2) {$DIGcampaigns = "''";} $stmtB="select sum(calls_today),sum(drops_today),sum(answers_today) from vicidial_campaign_stats where campaign_id IN($DIGcampaigns);"; if ($DB > 0) {echo "\n|$stmtB|\n";} @@ -963,6 +997,164 @@ if ( ($DROPINGROUPstats > 0) and (!preg_match("/ALL-ACTIVE/",$group_string)) ) } +##### CARRIER STATS TOTALS ### +$CARRIERstatsHTML=''; +if ($CARRIERstats > 0) + { + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeTWENTYFOURhoursAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $car_to_print = mysql_num_rows($rslt); + $ctp=0; + while ($car_to_print > $ctp) + { + $row=mysql_fetch_row($rslt); + $TFhour_status[$ctp] = $row[0]; + $TFhour_count[$ctp] = $row[1]; + $dialstatuses .= "'$row[0]',"; + $ctp++; + } + $dialstatuses = preg_replace("/,$/",'',$dialstatuses); + + $CARRIERstatsHTML .= "
"; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + + if (strlen($dialstatuses) > 1) + { + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeSIXhoursAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$SIXhour_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeONEhourAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$ONEhour_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeFIFTEENminutesAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$FTminute_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeFIVEminutesAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$FIVEminute_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + $stmtB="select dialstatus,count(*) from vicidial_carrier_log where call_date >= \"$timeONEminuteAGO\" group by dialstatus;"; + if ($DB > 0) {echo "\n|$stmtB|\n";} + $rslt=mysql_query($stmtB, $link); + $scar_to_print = mysql_num_rows($rslt); + $print_sctp=0; + while ($scar_to_print > $print_sctp) + { + $row=mysql_fetch_row($rslt); + $print_ctp=0; + while ($print_ctp < $ctp) + { + if ($TFhour_status[$print_ctp] == $row[0]) + {$ONEminute_count[$print_ctp] = $row[1];} + $print_ctp++; + } + $print_sctp++; + } + + + $print_ctp=0; + while ($print_ctp < $ctp) + { + if (strlen($TFhour_count[$print_ctp])<1) {$TFhour_count[$print_ctp]=0;} + if (strlen($SIXhour_count[$print_ctp])<1) {$SIXhour_count[$print_ctp]=0;} + if (strlen($ONEhour_count[$print_ctp])<1) {$ONEhour_count[$print_ctp]=0;} + if (strlen($FTminute_count[$print_ctp])<1) {$FTminute_count[$print_ctp]=0;} + if (strlen($FIVEminute_count[$print_ctp])<1) {$FIVEminute_count[$print_ctp]=0;} + if (strlen($ONEminute_count[$print_ctp])<1) {$ONEminute_count[$print_ctp]=0;} + + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $CARRIERstatsHTML .= ""; + $print_ctp++; + } + } + else + { + $CARRIERstatsHTML .= ""; + } + $CARRIERstatsHTML .= "
CARRIER STATS:                 HANGUP STATUS     24 HOURS     6 HOURS     1 HOUR     15 MIN     5 MIN     1 MIN  
     $TFhour_status[$print_ctp] $TFhour_count[$print_ctp] $SIXhour_count[$print_ctp] $ONEhour_count[$print_ctp] $FTminute_count[$print_ctp] $FIVEminute_count[$print_ctp] $ONEminute_count[$print_ctp]
no log entries
"; + $CARRIERstatsHTML .= "
Numero Utente: $NWB#vicidial_users-user$NWE
Numero Utente: $NWB#vicidial_users-user$NWE
Password: $NWB#vicidial_users-pass$NWE
Password: $NWB#vicidial_users-pass$NWE
Nome Completo: $NWB#vicidial_users-full_name$NWE
Livello Utente:
Numero Utente: $NWB#vicidial_users-user$NWE
Numero Utente: $NWB#vicidial_users-user$NWE
Password: $NWB#vicidial_users-pass$NWE
Password: $NWB#vicidial_users-pass$NWE
Nome Completo: $NWB#vicidial_users-full_name$NWE
\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/dbconnect.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/dbconnect.php index dca45485..ca505cc0 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/dbconnect.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/dbconnect.php @@ -4,47 +4,48 @@ # # database connection settings and some global web settings # -# Copyright (C) 2009 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # if ( file_exists("/etc/astguiclient.conf") ) -{ -$DBCagc = file("/etc/astguiclient.conf"); -foreach ($DBCagc as $DBCline) { - $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); - if (ereg("^PATHlogs", $DBCline)) - {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} - if (ereg("^PATHweb", $DBCline)) - {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} - if (ereg("^VARserver_ip", $DBCline)) - {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} - if (ereg("^VARDB_server", $DBCline)) - {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} - if (ereg("^VARDB_database", $DBCline)) - {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} - if (ereg("^VARDB_user", $DBCline)) - {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} - if (ereg("^VARDB_pass", $DBCline)) - {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} - if (ereg("^VARDB_port", $DBCline)) - {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + $DBCagc = file("/etc/astguiclient.conf"); + foreach ($DBCagc as $DBCline) + { + $DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline); + if (ereg("^PATHlogs", $DBCline)) + {$PATHlogs = $DBCline; $PATHlogs = preg_replace("/.*=/","",$PATHlogs);} + if (ereg("^PATHweb", $DBCline)) + {$WeBServeRRooT = $DBCline; $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);} + if (ereg("^VARserver_ip", $DBCline)) + {$WEBserver_ip = $DBCline; $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);} + if (ereg("^VARDB_server", $DBCline)) + {$VARDB_server = $DBCline; $VARDB_server = preg_replace("/.*=/","",$VARDB_server);} + if (ereg("^VARDB_database", $DBCline)) + {$VARDB_database = $DBCline; $VARDB_database = preg_replace("/.*=/","",$VARDB_database);} + if (ereg("^VARDB_user", $DBCline)) + {$VARDB_user = $DBCline; $VARDB_user = preg_replace("/.*=/","",$VARDB_user);} + if (ereg("^VARDB_pass", $DBCline)) + {$VARDB_pass = $DBCline; $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);} + if (ereg("^VARDB_port", $DBCline)) + {$VARDB_port = $DBCline; $VARDB_port = preg_replace("/.*=/","",$VARDB_port);} + } + } +else + { + #defaults for DB connection + $VARDB_server = 'localhost'; + $VARDB_port = '3306'; + $VARDB_user = 'cron'; + $VARDB_pass = '1234'; + $VARDB_database = '1234'; + $WeBServeRRooT = '/usr/local/apache2/htdocs'; } -} -else -{ -#defaults for DB connection -$VARDB_server = 'localhost'; -$VARDB_user = 'cron'; -$VARDB_pass = '1234'; -$VARDB_database = '1234'; -$WeBServeRRooT = '/usr/local/apache2/htdocs'; -} - -$link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass"); -if (!$link) { +$link=mysql_connect("$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass"); +if (!$link) + { die('MySQL connect ERROR: ' . mysql_error()); -} + } mysql_select_db("$VARDB_database"); $local_DEF = 'Local/'; diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/new_listloader_superL.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/new_listloader_superL.php index fe330845..1e549726 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/new_listloader_superL.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/new_listloader_superL.php @@ -1638,7 +1638,7 @@ exit; function lookup_gmt($phone_code,$USarea,$state,$LOCAL_GMT_OFF_STD,$Shour,$Smin,$Ssec,$Smon,$Smday,$Syear,$postalgmt,$postal_code) { -require("dbconnect.php"); +global $link; $postalgmt_found=0; if ( (eregi("POSTAL",$postalgmt)) && (strlen($postal_code)>4) ) diff --git a/agc_2-X/branches/agc_2.2.0/extras/MySQL_AST_CREATE_tables.sql b/agc_2-X/branches/agc_2.2.0/extras/MySQL_AST_CREATE_tables.sql index 27f1b780..b1338a60 100644 --- a/agc_2-X/branches/agc_2.2.0/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/branches/agc_2.2.0/extras/MySQL_AST_CREATE_tables.sql @@ -1913,7 +1913,7 @@ INSERT INTO vicidial_inbound_groups(group_id,group_name,group_color,active,queue INSERT INTO vicidial_lists SET list_id='999',list_name='Default inbound list',campaign_id='TESTCAMP',active='N'; INSERT INTO vicidial_lists SET list_id='998',list_name='Default Manual list',campaign_id='TESTCAMP',active='N'; -INSERT INTO system_settings (version,install_date) values('2.2.0rc6', CURDATE()); +INSERT INTO system_settings (version,install_date) values('2.2.0rc7', CURDATE()); INSERT INTO vicidial_status_categories (vsc_id,vsc_name) values('UNDEFINED','Default Category'); diff --git a/agc_2-X/branches/agc_2.2.0/extras/upgrade_2.2.0.sql b/agc_2-X/branches/agc_2.2.0/extras/upgrade_2.2.0.sql index 3dcaa3b4..db00829a 100644 --- a/agc_2-X/branches/agc_2.2.0/extras/upgrade_2.2.0.sql +++ b/agc_2-X/branches/agc_2.2.0/extras/upgrade_2.2.0.sql @@ -734,4 +734,4 @@ CREATE TABLE vicidial_carrier_log_archive LIKE vicidial_carrier_log; UPDATE system_settings SET db_schema_version='1193',db_schema_update_date=NOW(); -UPDATE system_settings SET version='2.2.0rc6',db_schema_update_date=NOW(); +UPDATE system_settings SET version='2.2.0rc7',db_schema_update_date=NOW(); diff --git a/agc_2-X/branches/agc_2.2.0/version b/agc_2-X/branches/agc_2.2.0/version index 676a2fb2..36fba792 100644 --- a/agc_2-X/branches/agc_2.2.0/version +++ b/agc_2-X/branches/agc_2.2.0/version @@ -1 +1 @@ -2.2.0rc6 +2.2.0rc7
Inizio ID Utente: (solo cifre, incremented)$NWB#vicidial_remote_agents-user_start$NWE
Inizio ID Utente: (solo cifre, incremented)$NWB#vicidial_remote_agents-user_start$NWE
Numero di Linee: (solo cifre)$NWB#vicidial_remote_agents-number_of_lines$NWE
IP Server:
Exten de VmaiDumpl: $NWB#phones-voicemail_dump_exten$NWE
Contexto De Exten: $NWB#phones-ext_context$NWE
Telefono Contesto: $NWB#phones-phone_context$NWE
Conf file segreto: $NWB#phones-conf_secret$NWE
Conf file segreto: $NWB#phones-conf_secret$NWE
Canal de envío del DTMF: $NWB#phones-dtmf_send_extension$NWE
Grupo de las llamadas de salida: $NWB#phones-call_out_number_group$NWE
Localizacio`n del Navegador: $NWB#phones-client_browser$NWE