diff --git a/agc_2-X/trunk/bin/ADMIN_update_server_ip.pl b/agc_2-X/trunk/bin/ADMIN_update_server_ip.pl index 5fd564d8..7e1ad39a 100644 --- a/agc_2-X/trunk/bin/ADMIN_update_server_ip.pl +++ b/agc_2-X/trunk/bin/ADMIN_update_server_ip.pl @@ -466,11 +466,11 @@ if( $VARserver_ip =~ m/(\S+)\.(\S+)\.(\S+)\.(\S+)/ ) print "\n"; print "SERVER IP ADDRESS CHANGE FOR VICIDIAL FINISHED!\n"; print "\n"; -print "If you are not having VICIDIAL auto-generate your conf files, please\n"; -print "remember to change your extensions.conf entries for the new IP address:\n"; -print "exten => _$VARremDIALstr*.,1,Goto(default,${EXTEN:16},1)\n"; -print "exten => _8600XXX*.,1,AGI(agi-VDADfixCXFER.agi)\n"; -print "exten => _78600XXX*.,1,AGI(agi-VDADfixCXFER.agi)\n"; +#print "If you are not having VICIDIAL auto-generate your conf files, please\n"; +#print "remember to change your extensions.conf entries for the new IP address:\n"; +#print "exten => _$VARremDIALstr*.,1,Goto(default,\${EXTEN:16},1)\n"; +#print "exten => _8600XXX*.,1,AGI(agi-VDADfixCXFER.agi)\n"; +#print "exten => _78600XXX*.,1,AGI(agi-VDADfixCXFER.agi)\n"; $secy = time(); $secz = ($secy - $secX); $minz = ($secz/60); # calculate script runtime so far diff --git a/agc_2-X/trunk/docs/conf_examples/features.conf.sample b/agc_2-X/trunk/docs/conf_examples/features.conf.sample index f330de93..21ddf7ab 100644 --- a/agc_2-X/trunk/docs/conf_examples/features.conf.sample +++ b/agc_2-X/trunk/docs/conf_examples/features.conf.sample @@ -34,13 +34,14 @@ context => parkedcalls ; Which context parked calls are in ; The follow effectively disables the built in blind transfer feature of Asterisk. ; This sets it to a DTMF tone that asterisk cannot even process, that is only available ; on certain telco style test sets. This does NOT disable the VICIDIAL blind transfer -; abilityi as this is implemented through other means. If you are using your VICIDIAL +; ability as this is implemented through other means. If you are using your VICIDIAL ; server as PBX you may want to comment this out. Be aware however that this can make ; it so that anyone can transfer the call to anyone else that is allowed by your dialplan. ; IE someone you have called could transfer the call to a their mother, the Pope, or ; a 900 number if you do not have your dialplan carefully setup. -blindxfer => D +blindxfer => CC +disconnect => B [applicationmap] diff --git a/agc_2-X/trunk/www/agc/vicidial.php b/agc_2-X/trunk/www/agc/vicidial.php index 897c5c13..636f62eb 100644 --- a/agc_2-X/trunk/www/agc/vicidial.php +++ b/agc_2-X/trunk/www/agc/vicidial.php @@ -265,10 +265,11 @@ # 91205-2055 - Added CONSULTATIVE checkbox in a redesigned Transfer-Conf frame # 91206-2020 - Fixed vicidial_agent_log logging bug on logout when not paused # 91211-1412 - Added User custom variables and CRM login popup +# 91219-0657 - Set pause code automatically on ReQueue and INBOUND_MAN Dial-Next-Number # -$version = '2.2.0-243'; -$build = '91211-1412'; +$version = '2.2.0-244'; +$build = '91219-0657'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -1295,7 +1296,7 @@ $VDloginDISPLAY=0; if ( ($campaign_allow_inbound == 'Y') and ($dial_method != 'MANUAL') ) { $VARingroups=''; - $stmt="select group_id from vicidial_inbound_groups where active = 'Y' and group_id IN($closer_campaigns) order by group_id limit 60;"; + $stmt="select group_id from vicidial_inbound_groups where active = 'Y' and group_id IN($closer_campaigns) order by group_id limit 600;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01015',$VD_login,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} @@ -1342,7 +1343,7 @@ $VDloginDISPLAY=0; if ($allow_closers == 'Y') { $VARxfergroups=''; - $stmt="select group_id,group_name from vicidial_inbound_groups where active = 'Y' and group_id IN($xfer_groups) order by group_id limit 60;"; + $stmt="select group_id,group_name from vicidial_inbound_groups where active = 'Y' and group_id IN($xfer_groups) order by group_id limit 600;"; $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01016',$VD_login,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} @@ -4601,7 +4602,9 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { auto_dial_level=0; - agent_log_id = AutoDial_ReSume_PauSe('VDADpause'); + agent_log_id = AutoDial_ReSume_PauSe("VDADpause",'','','',"DIALNEXT"); + + PauseCodeSelect_submit("NXDIAL"); document.getElementById("DiaLControl").innerHTML = "\"\"Resume\"
\"Dial"; } @@ -5485,7 +5488,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // ################################################################################ // Set the client to READY and start looking for calls (VDADready, VDADpause) - function AutoDial_ReSume_PauSe(taskaction,taskagentlog,taskwrapup,taskstatuschange,templogout) + function AutoDial_ReSume_PauSe(taskaction,taskagentlog,taskwrapup,taskstatuschange,temp_reason) { if (taskaction == 'VDADready') { @@ -5526,7 +5529,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML; } - if ( (agent_pause_codes_active=='FORCE') && (templogout != 'LOGOUT') ) + if ( (agent_pause_codes_active=='FORCE') && (temp_reason != 'LOGOUT') && (temp_reason != 'REQUEUE') && (temp_reason != 'DIALNEXT') ) { PauseCodeSelectContent_create(); } @@ -8759,6 +8762,10 @@ function phone_number_format(formatphone) { document.vicidial_form.DispoSelection.value = 'RQXFER'; DispoSelect_submit(); + + AutoDial_ReSume_PauSe("VDADpause",'','','',"REQUEUE"); + + PauseCodeSelect_submit("RQUEUE"); } diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index 05dd6ea8..0adf30c8 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -2015,11 +2015,12 @@ else # 91205-2231 - Added delete_vm_after_email voicemail option to phones and extra voicemail sections # 91210-2038 - Added better logging of Campaign emergency logout # 91211-1359 - Added custom user fields and campaign CRM login fields +# 91219-0719 - Changed some field backgrounds in the Campaign Modification screens # # 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-228'; -$build = '91211-1359'; +$admin_version = '2.2.0-229'; +$build = '91219-0719'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -6439,7 +6440,7 @@ if ($ADD==11) if ($SSoutbound_autodial_active > 0) { echo "Allow Closers: $NWB#vicidial_campaigns-allow_closers$NWE\n"; - echo "Hopper Level: $NWB#vicidial_campaigns-hopper_level$NWE\n"; + echo "Hopper Level: $NWB#vicidial_campaigns-hopper_level$NWE\n"; echo "Auto Dial Level: $NWB#vicidial_campaigns-active$NWE\n"; + echo "Active: $NWB#vicidial_campaigns-active$NWE\n"; echo "Park Extension: - Filename: $NWB#vicidial_campaigns-park_ext$NWE\n"; echo "Web Form: $NWB#vicidial_campaigns-web_form_address$NWE\n"; if ($SSenable_second_webform > 0) @@ -16157,7 +16158,7 @@ if ($ADD==31) $o++; $Dstatus = $Dstatuses[$o]; - echo "Dial Status $o: \n"; + echo "Dial Status $o: \n"; if ($DEFstatusDISABLED > 0) { @@ -16171,7 +16172,7 @@ if ($ADD==31) } } - echo "Add A Dial Status: \n"; echo "\n"; echo "$dial_statuses_list"; @@ -16299,7 +16300,7 @@ if ($ADD==31) echo "Drop Lockout Time: $NWB#vicidial_campaigns-drop_lockout_time$NWE\n"; - echo "Hopper Level: $NWB#vicidial_campaigns-hopper_level$NWE\n"; + echo "Hopper Level: $NWB#vicidial_campaigns-hopper_level$NWE\n"; echo "Force Reset of Hopper: $NWB#vicidial_campaigns-force_reset_hopper$NWE\n"; @@ -16485,13 +16486,13 @@ if ($ADD==31) if ($SSoutbound_autodial_active > 0) { - echo "Dial Timeout: in seconds$NWB#vicidial_campaigns-dial_timeout$NWE\n"; + echo "Dial Timeout: in seconds$NWB#vicidial_campaigns-dial_timeout$NWE\n"; } echo "Dial Prefix: for 91NXXNXXXXXX value would be 9, for no dial prefix use X$NWB#vicidial_campaigns-dial_prefix$NWE\n"; echo "Omit Phone Code: $NWB#vicidial_campaigns-omit_phone_code$NWE\n"; - echo "Campaign CallerID: $NWB#vicidial_campaigns-campaign_cid$NWE\n"; + echo "Campaign CallerID: $NWB#vicidial_campaigns-campaign_cid$NWE\n"; $stmt="SELECT count(*) from vicidial_lists where campaign_id='$campaign_id' and campaign_cid_override != '' and active='Y';"; $rslt=mysql_query($stmt, $link); $rowx=mysql_fetch_row($rslt); @@ -16501,7 +16502,7 @@ if ($ADD==31) if ($SSoutbound_autodial_active > 0) { - echo "Campaign VDAD exten: $NWB#vicidial_campaigns-campaign_vdad_exten$NWE\n"; + echo "Campaign VDAD exten: $NWB#vicidial_campaigns-campaign_vdad_exten$NWE\n"; } echo "Campaign Rec exten: $NWB#vicidial_campaigns-campaign_rec_exten$NWE\n"; @@ -16524,7 +16525,7 @@ if ($ADD==31) echo "Get Call Launch: $NWB#vicidial_campaigns-get_call_launch$NWE\n"; - echo "Answering Machine Message: audio chooser $NWB#vicidial_campaigns-am_message_exten$NWE\n"; + echo "Answering Machine Message: audio chooser $NWB#vicidial_campaigns-am_message_exten$NWE\n"; $stmt="SELECT count(*) from vicidial_lists where campaign_id='$campaign_id' and am_message_exten_override != '' and active='Y';"; $rslt=mysql_query($stmt, $link); $rowx=mysql_fetch_row($rslt); @@ -16532,13 +16533,13 @@ if ($ADD==31) {echo " LIST OVERRIDE ACTIVE";} echo "\n"; - echo "WaitForSilence Options: $NWB#vicidial_campaigns-waitforsilence_options$NWE\n"; + echo "WaitForSilence Options: $NWB#vicidial_campaigns-waitforsilence_options$NWE\n"; if ($SSoutbound_autodial_active > 0) { - echo "AMD Send to VM exten: $NWB#vicidial_campaigns-amd_send_to_vmx$NWE\n"; + echo "AMD Send to VM exten: $NWB#vicidial_campaigns-amd_send_to_vmx$NWE\n"; - echo "CPD AMD Action: $NWB#vicidial_campaigns-cpd_amd_action$NWE\n"; + echo "CPD AMD Action: $NWB#vicidial_campaigns-cpd_amd_action$NWE\n"; } echo "Transfer-Conf DTMF 1: $NWB#vicidial_campaigns-xferconf_a_dtmf$NWE\n"; @@ -16560,15 +16561,15 @@ if ($ADD==31) if ($SSoutbound_autodial_active > 0) { - echo "Drop Call Seconds: $NWB#vicidial_campaigns-drop_call_seconds$NWE\n"; + echo "Drop Call Seconds: $NWB#vicidial_campaigns-drop_call_seconds$NWE\n"; - echo "Drop Action: $NWB#vicidial_campaigns-drop_action$NWE\n"; + echo "Drop Action: $NWB#vicidial_campaigns-drop_action$NWE\n"; - echo "Safe Harbor Exten: $NWB#vicidial_campaigns-safe_harbor_exten$NWE\n"; + echo "Safe Harbor Exten: $NWB#vicidial_campaigns-safe_harbor_exten$NWE\n"; - echo "Voicemail: voicemail chooser$NWB#vicidial_campaigns-voicemail_ext$NWE\n"; + echo "Voicemail: voicemail chooser$NWB#vicidial_campaigns-voicemail_ext$NWE\n"; - echo "Drop Transfer Group: "; echo "$Dgroups_menu"; echo "$NWB#vicidial_campaigns-drop_inbound_group$NWE\n"; $stmt="SELECT count(*) from vicidial_lists where campaign_id='$campaign_id' and drop_inbound_group_override != '' and active='Y';"; @@ -16582,16 +16583,16 @@ if ($ADD==31) echo "Wrap Up Message: $NWB#vicidial_campaigns-wrapup_message$NWE\n"; - echo "Use Internal DNC List: $NWB#vicidial_campaigns-use_internal_dnc$NWE\n"; + echo "Use Internal DNC List: $NWB#vicidial_campaigns-use_internal_dnc$NWE\n"; - echo "Use Campaign DNC List: $NWB#vicidial_campaigns-use_campaign_dnc$NWE\n"; + echo "Use Campaign DNC List: $NWB#vicidial_campaigns-use_campaign_dnc$NWE\n"; echo "Agent Pause Codes Active: $NWB#vicidial_campaigns-agent_pause_codes_active$NWE\n"; echo "Campaign Stats Refresh: $NWB#vicidial_campaigns-campaign_stats_refresh$NWE\n"; - echo "Disable Alter Customer Data: $NWB#vicidial_campaigns-disable_alter_custdata$NWE\n"; - echo "Disable Alter Customer Phone: $NWB#vicidial_campaigns-disable_alter_custphone$NWE\n"; + echo "Disable Alter Customer Data: $NWB#vicidial_campaigns-disable_alter_custdata$NWE\n"; + echo "Disable Alter Customer Phone: $NWB#vicidial_campaigns-disable_alter_custphone$NWE\n"; if ($SSoutbound_autodial_active > 0) { @@ -16605,24 +16606,24 @@ if ($ADD==31) { echo "Agent Select Territories: $NWB#vicidial_campaigns-agent_select_territories$NWE\n"; } - echo "Agent Display Dialable Leads: $NWB#vicidial_campaigns-agent_display_dialable_leads$NWE\n"; + echo "Agent Display Dialable Leads: $NWB#vicidial_campaigns-agent_display_dialable_leads$NWE\n"; } - echo "Agent Display Queue Count: $NWB#vicidial_campaigns-display_queue_count$NWE\n"; + echo "Agent Display Queue Count: $NWB#vicidial_campaigns-display_queue_count$NWE\n"; - echo "Agent View Calls in Queue: $NWB#vicidial_campaigns-view_calls_in_queue$NWE\n"; + echo "Agent View Calls in Queue: $NWB#vicidial_campaigns-view_calls_in_queue$NWE\n"; - echo "View Calls in Queue Launch: $NWB#vicidial_campaigns-view_calls_in_queue_launch$NWE\n"; + echo "View Calls in Queue Launch: $NWB#vicidial_campaigns-view_calls_in_queue_launch$NWE\n"; - echo "Agent Grab Calls in Queue: $NWB#vicidial_campaigns-grab_calls_in_queue$NWE\n"; + echo "Agent Grab Calls in Queue: $NWB#vicidial_campaigns-grab_calls_in_queue$NWE\n"; echo "Agent Call Re-Queue Button: $NWB#vicidial_campaigns-call_requeue_button$NWE\n"; echo "Agent Pause After Each Call: $NWB#vicidial_campaigns-pause_after_each_call$NWE\n"; - echo "Manual Dial List ID: $NWB#vicidial_campaigns-manual_dial_list_id$NWE\n"; + echo "Manual Dial List ID: $NWB#vicidial_campaigns-manual_dial_list_id$NWE\n"; - echo "Manual Dial Filter: $NWB#vicidial_campaigns-manual_dial_filter$NWE\n"; + echo "Manual Dial Filter: $NWB#vicidial_campaigns-manual_dial_filter$NWE\n"; echo "Agent Screen Clipboard Copy: $NWB#vicidial_campaigns-agent_clipboard_copy$NWE\n"; @@ -16630,9 +16631,9 @@ if ($ADD==31) { echo "Agent Screen Extended Alt Dial: $NWB#vicidial_campaigns-agent_extended_alt_dial$NWE\n"; } - echo "3-Way Call Outbound CallerID: $NWB#vicidial_campaigns-three_way_call_cid$NWE\n"; + echo "3-Way Call Outbound CallerID: $NWB#vicidial_campaigns-three_way_call_cid$NWE\n"; - echo "3-Way Call Dial Prefix: $NWB#vicidial_campaigns-three_way_dial_prefix$NWE\n"; + echo "3-Way Call Dial Prefix: $NWB#vicidial_campaigns-three_way_dial_prefix$NWE\n"; echo "Group Alias Allowed: $NWB#vicidial_campaigns-agent_allow_group_alias$NWE\n"; @@ -16666,17 +16667,17 @@ if ($ADD==31) if ($SSenable_vtiger_integration > 0) { - echo "Vtiger Search Category: $NWB#vicidial_campaigns-vtiger_search_category$NWE\n"; + echo "Vtiger Search Category: $NWB#vicidial_campaigns-vtiger_search_category$NWE\n"; - echo "Vtiger Search Dead Accounts: $NWB#vicidial_campaigns-vtiger_search_dead$NWE\n"; + echo "Vtiger Search Dead Accounts: $NWB#vicidial_campaigns-vtiger_search_dead$NWE\n"; - echo "Vtiger Create Call Record: $NWB#vicidial_campaigns-vtiger_create_call_record$NWE\n"; + echo "Vtiger Create Call Record: $NWB#vicidial_campaigns-vtiger_create_call_record$NWE\n"; - echo "Vtiger Create Lead Record: $NWB#vicidial_campaigns-vtiger_create_lead_record$NWE\n"; + echo "Vtiger Create Lead Record: $NWB#vicidial_campaigns-vtiger_create_lead_record$NWE\n"; - echo "Vtiger Status Call: $NWB#vicidial_campaigns-vtiger_status_call$NWE\n"; + echo "Vtiger Status Call: $NWB#vicidial_campaigns-vtiger_status_call$NWE\n"; - echo "Vtiger Screen Login: $NWB#vicidial_campaigns-vtiger_screen_login$NWE\n"; + echo "Vtiger Screen Login: $NWB#vicidial_campaigns-vtiger_screen_login$NWE\n"; } else { @@ -17478,7 +17479,7 @@ if ($ADD==34) echo "Campaign Change Date: $campaign_changedate   $NWB#vicidial_campaigns-campaign_changedate$NWE\n"; echo "Campaign Login Date: $campaign_logindate   $NWB#vicidial_campaigns-campaign_logindate$NWE\n"; - echo "Active: $NWB#vicidial_campaigns-active$NWE\n"; + echo "Active: $NWB#vicidial_campaigns-active$NWE\n"; echo "Park Extension: $row[9] - $row[10]$NWB#vicidial_campaigns-park_ext$NWE\n"; echo "Web Form: $row[11]$NWB#vicidial_campaigns-web_form_address$NWE\n"; echo "Allow Closers: $row[12] $NWB#vicidial_campaigns-allow_closers$NWE\n"; @@ -17493,7 +17494,7 @@ if ($ADD==34) $o++; $Dstatus = $Dstatuses[$o]; - echo "Dial Status $o: \n"; + echo "Dial Status $o: \n"; if ($DEFstatusDISABLED > 0) { echo "$Dstatus - $statname_list[$Dstatus]         \n"; @@ -17506,7 +17507,7 @@ if ($ADD==34) } } - echo "Add A Dial Status: \n"; echo "\n"; echo "$dial_statuses_list"; @@ -17632,7 +17633,7 @@ if ($ADD==34) echo "\n"; echo "$NWB#vicidial_campaigns-lead_filter_id$NWE\n"; - echo "Hopper Level: $NWB#vicidial_campaigns-hopper_level$NWE\n"; + echo "Hopper Level: $NWB#vicidial_campaigns-hopper_level$NWE\n"; echo "Force Reset of Hopper: $NWB#vicidial_campaigns-force_reset_hopper$NWE\n";