From dc2afb2675ab1716230f4e8280412efbb795cecb Mon Sep 17 00:00:00 2001 From: mattf Date: Sat, 4 Apr 2015 20:03:33 +0000 Subject: [PATCH] Added option to populate the entry_list_id from the DID when routing to an In-Group git-svn-id: svn://192.168.202.10@2302 3d104415-ff17-0410-8863-d5cf3c621b8a --- .../agc_2.0.4/extras/phone_codes_GMT.txt | 40 +++++++------- agc_2-X/trunk/UPGRADE | 3 ++ agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi | 54 +++++++++++++++---- agc_2-X/trunk/bin/AST_recordings_export.pl | 22 ++++---- .../trunk/extras/MySQL_AST_CREATE_tables.sql | 11 ++-- agc_2-X/trunk/extras/upgrade_2.12.sql | 7 +++ agc_2-X/trunk/www/vicidial/admin.php | 49 ++++++++++++++--- agc_2-X/trunk/www/vicidial/help.php | 11 ++++ 8 files changed, 144 insertions(+), 53 deletions(-) diff --git a/agc_2-X/branches/agc_2.0.4/extras/phone_codes_GMT.txt b/agc_2-X/branches/agc_2.0.4/extras/phone_codes_GMT.txt index 05546151..e28bf443 100644 --- a/agc_2-X/branches/agc_2.0.4/extras/phone_codes_GMT.txt +++ b/agc_2-X/branches/agc_2.0.4/extras/phone_codes_GMT.txt @@ -864,30 +864,30 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE 57 COL * -5 N Columbia COT 58 VEN * -4 N Venezuela VET 60 MYS * +8 N Malaysia MYT -61 AUS 2 NS +10 Y FSO-LSM New South Wales & Capitol EST -61 AUS 3 VI +10 Y FSO-LSM Victoria EST -61 AUS 5 +10 Y FSO-LSM Prefix 5 nonexistant EST +61 AUS 2 NS +10 Y FSO-FSA New South Wales & Capitol EST +61 AUS 3 VI +10 Y FSO-FSA Victoria EST +61 AUS 5 +10 Y FSO-FSA Prefix 5 nonexistant EST 61 AUS 7 QL +10 N Queensland EST -61 AUS 36 TA +10 Y FSO-LSM Tasmania EST -61 AUS 80 SA +9.5 Y FSO-LSM Southern Australia CST -61 AUS 81 SA +9.5 Y FSO-LSM Southern Australia CST -61 AUS 82 WA +8 N LSO-LSM Western Australia WST -61 AUS 83 SA +9.5 Y FSO-LSM Southern Australia CST -61 AUS 84 WA +8 N LSO-LSM Western Australia WST -61 AUS 85 SA +9.5 Y FSO-LSM Southern Australia CST -61 AUS 86 WA +8 N LSO-LSM Western Australia WST -61 AUS 88 SA +9.5 Y FSO-LSM Southern Australia CST -61 AUS 89 WA +8 N LSO-LSM Western Australia WST +61 AUS 36 TA +10 Y FSO-FSA Tasmania EST +61 AUS 80 SA +9.5 Y FSO-FSA Southern Australia CST +61 AUS 81 SA +9.5 Y FSO-FSA Southern Australia CST +61 AUS 82 WA +8 N Western Australia WST +61 AUS 83 SA +9.5 Y FSO-FSA Southern Australia CST +61 AUS 84 WA +8 N Western Australia WST +61 AUS 85 SA +9.5 Y FSO-FSA Southern Australia CST +61 AUS 86 WA +8 N Western Australia WST +61 AUS 88 SA +9.5 Y FSO-FSA Southern Australia CST +61 AUS 89 WA +8 N Western Australia WST 61 AUS 889 NT +9.5 N Northern Territory CST 61 AUS 4S WA +8 N Mobile numbers Western Australia WST 61 AUS 4S NT +9.5 N Mobile numbers Northern Territory CST -61 AUS 4S SA +9.5 Y FSO-LSM Mobile numbers South Australia CST -61 AUS 4S TA +10 Y FSO-LSM Mobile numbers Tasmania EST -61 AUS 4S AC +10 Y FSO-LSM Mobile numbers Capitol EST -61 AUS 4S NS +10 Y FSO-LSM Mobile numbers New South Wales EST -61 AUS 4S +10 Y FSO-LSM Mobile numbers No State Given EST -61 AUS 4S QL +10 Y Mobile numbers Queensland EST -61 AUS 4S VI +10 Y FSO-LSM Mobile numbers Victoria EST +61 AUS 4S SA +9.5 Y FSO-FSA Mobile numbers South Australia CST +61 AUS 4S TA +10 Y FSO-FSA Mobile numbers Tasmania EST +61 AUS 4S AC +10 Y FSO-FSA Mobile numbers Capitol EST +61 AUS 4S NS +10 Y FSO-FSA Mobile numbers New South Wales EST +61 AUS 4S +10 Y FSO-FSA Mobile numbers No State Given EST +61 AUS 4S QL +10 N Mobile numbers Queensland EST +61 AUS 4S VI +10 Y FSO-FSA Mobile numbers Victoria EST 62 IDN * +7 N Indonesia WIB 63 PHL * +8 N Philippines PHT 64 NZL * +12 Y FSO-TSM New Zealand NZST diff --git a/agc_2-X/trunk/UPGRADE b/agc_2-X/trunk/UPGRADE index f21dd38a..8dec8e39 100644 --- a/agc_2-X/trunk/UPGRADE +++ b/agc_2-X/trunk/UPGRADE @@ -62,6 +62,9 @@ OTHER CHANGES: 2. Added ability to use single-quotes in vicidial_list fields. Through the agent screen and all lead import methods +3. Added option to populate the entry_list_id from the DID when routing to an + In-Group + diff --git a/agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi b/agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi index b05abae9..02029e54 100644 --- a/agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi +++ b/agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# agi-VDAD_ALL_inbound.agi version 2.10 +# agi-VDAD_ALL_inbound.agi version 2.12 # # runs when a call comes in from an inbound call. This script will # send the calls out to the closers that are logged in. @@ -82,7 +82,7 @@ #exten => _99909*.,2,AGI(agi-VDAD_ALL_inbound.agi) #exten => _99909*.,3,Hangup # -# Copyright (C) 2014 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2015 Matt Florell LICENSE: AGPLv2 # # changes: # 70828-0924 - First Build @@ -192,6 +192,7 @@ # 140312-2111 - Added CALLID as recording filename variable # 140417-0932 - Added max inbound calls feature # 141211-2028 - Added list_id to call url functions +# 150404-1011 - Added entry_list_id related DID options # $script = 'agi-VDAD_ALL_inbound.agi'; @@ -207,6 +208,7 @@ $mysql_log_count=208; $one_mysql_log=0; $dial_ingroup_flag=0; $called_count=1; +$entry_list_id=0; ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time); @@ -320,7 +322,7 @@ $sthA->finish(); ############################################# ##### START SYSTEM SETTINGS LOOKUP ##### -$stmtA = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,queuemetrics_eq_prepend,queuemetrics_pe_phone_append,did_agent_log,alt_log_server_ip,alt_log_dbname,alt_log_login,alt_log_pass,tables_use_alt_log_db,did_ra_extensions_enabled,queuemetrics_socket,queuemetrics_socket_url FROM system_settings;"; +$stmtA = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,queuemetrics_eq_prepend,queuemetrics_pe_phone_append,did_agent_log,alt_log_server_ip,alt_log_dbname,alt_log_login,alt_log_pass,tables_use_alt_log_db,did_ra_extensions_enabled,queuemetrics_socket,queuemetrics_socket_url,enable_did_entry_list_id FROM system_settings;"; $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; $sthArows=$sthA->rows; @@ -345,6 +347,7 @@ if ($sthArows > 0) $did_ra_extensions_enabled = $aryA[14]; $queuemetrics_socket = $aryA[15]; $queuemetrics_socket_url = $aryA[16]; + $enable_did_entry_list_id = $aryA[17]; } $sthA->finish(); ##### END SYSTEM SETTINGS LOOKUP ##### @@ -454,11 +457,11 @@ if ($extension =~ /^999\d\d\*/) ### Grab DID values from the database if ($route_type =~ /FILTER/) { - $stmtA = "SELECT filter_call_handle_method,filter_agent_search_method,filter_group_id,did_pattern,filter_list_id,filter_phone_code,filter_campaign_id,filter_user,filter_user_unavailable_action,filter_user_route_settings_ingroup,filter_action,filter_voicemail_ext,filter_extension,filter_exten_context,filter_phone,filter_server_ip FROM vicidial_inbound_dids where did_id = '$did_id';"; + $stmtA = "SELECT filter_call_handle_method,filter_agent_search_method,filter_group_id,did_pattern,filter_list_id,filter_phone_code,filter_campaign_id,filter_user,filter_user_unavailable_action,filter_user_route_settings_ingroup,filter_action,filter_voicemail_ext,filter_extension,filter_exten_context,filter_phone,filter_server_ip,filter_entry_list_id FROM vicidial_inbound_dids where did_id = '$did_id';"; } else { - $stmtA = "SELECT call_handle_method,agent_search_method,group_id,did_pattern,list_id,phone_code,campaign_id,user,user_unavailable_action,user_route_settings_ingroup,did_route,voicemail_ext,extension,exten_context,phone,server_ip FROM vicidial_inbound_dids where did_id = '$did_id';"; + $stmtA = "SELECT call_handle_method,agent_search_method,group_id,did_pattern,list_id,phone_code,campaign_id,user,user_unavailable_action,user_route_settings_ingroup,did_route,voicemail_ext,extension,exten_context,phone,server_ip,entry_list_id FROM vicidial_inbound_dids where did_id = '$did_id';"; } $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; @@ -483,6 +486,7 @@ if ($extension =~ /^999\d\d\*/) $did_exten_context = $aryA[13]; $did_phone = $aryA[14]; $did_phone_server_ip = $aryA[15]; + $entry_list_id = $aryA[16]; if ($did_route =~ /AGENT/) {$channel_group = $user_route_settings_ingroup;} else @@ -977,8 +981,14 @@ if ($call_handle_method =~ /LOOKUP/) { if ( ( ($call_handle_method =~ /^VID/) && (length($vendor_id)) < 3) || (length($phone_number) < 3) ) { + $entry_list_idSQLa=''; $entry_list_idSQLb=''; + if ( ($enable_did_entry_list_id > 0) && ($entry_list_id > 0) ) + { + $entry_list_idSQLa=',entry_list_id'; + $entry_list_idSQLb=",'$entry_list_id'"; + } ### insert a record into the vicidial_list table - $stmtA = "INSERT INTO vicidial_list (entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,called_since_last_reset,phone_code,phone_number,security_phrase,called_count,gmt_offset_now,comments) values('$SQLdate','$tsSQLdate','INBND','$fronter','$vendor_id','VDCL','$list_id','Y','$phone_code','$phone_number','$channel_group','$called_count','$local_gmt','$VLcomments');"; + $stmtA = "INSERT INTO vicidial_list (entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,called_since_last_reset,phone_code,phone_number,security_phrase,called_count,gmt_offset_now,comments$entry_list_idSQLa) values('$SQLdate','$tsSQLdate','INBND','$fronter','$vendor_id','VDCL','$list_id','Y','$phone_code','$phone_number','$channel_group','$called_count','$local_gmt','$VLcomments'$entry_list_idSQLb);"; $affected_rows = $dbhA->do($stmtA); $dbhP=$dbhA; $mysql_count='02007'; $MEL_aff_rows=$affected_rows; &mysql_error_logging; $cbc=0; @@ -1120,8 +1130,14 @@ if ($call_handle_method =~ /LOOKUP/) } if ($VLfound < 1) { + $entry_list_idSQLa=''; $entry_list_idSQLb=''; + if ( ($enable_did_entry_list_id > 0) && ($entry_list_id > 0) ) + { + $entry_list_idSQLa=',entry_list_id'; + $entry_list_idSQLb=",'$entry_list_id'"; + } ### insert a record into the vicidial_list table - $stmtA = "INSERT INTO vicidial_list (entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,called_since_last_reset,phone_code,phone_number,security_phrase,called_count,gmt_offset_now,comments) values('$SQLdate','$tsSQLdate','INBND','$fronter','$vendor_id','VDCL','$list_id','Y','$phone_code','$phone_number','$channel_group','$called_count','$local_gmt','$VLcomments');"; + $stmtA = "INSERT INTO vicidial_list (entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,called_since_last_reset,phone_code,phone_number,security_phrase,called_count,gmt_offset_now,comments$entry_list_idSQLa) values('$SQLdate','$tsSQLdate','INBND','$fronter','$vendor_id','VDCL','$list_id','Y','$phone_code','$phone_number','$channel_group','$called_count','$local_gmt','$VLcomments'$entry_list_idSQLb);"; $affected_rows = $dbhA->do($stmtA); $dbhP=$dbhA; $mysql_count='02011'; $MEL_aff_rows=$affected_rows; &mysql_error_logging; $cbc=0; @@ -1197,8 +1213,14 @@ else else { + $entry_list_idSQLa=''; $entry_list_idSQLb=''; + if ( ($enable_did_entry_list_id > 0) && ($entry_list_id > 0) ) + { + $entry_list_idSQLa=',entry_list_id'; + $entry_list_idSQLb=",'$entry_list_id'"; + } ### insert a record into the vicidial_list table if no record was found above - $stmtA = "INSERT INTO vicidial_list (entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,called_since_last_reset,phone_code,phone_number,security_phrase,called_count,gmt_offset_now,comments) values('$SQLdate','$tsSQLdate','INBND','$fronter','$vendor_id','VDCL','$list_id','Y','$phone_code','$phone_number','$channel_group','$called_count','-5.00','$VLcomments');"; + $stmtA = "INSERT INTO vicidial_list (entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,called_since_last_reset,phone_code,phone_number,security_phrase,called_count,gmt_offset_now,comments$entry_list_idSQLa) values('$SQLdate','$tsSQLdate','INBND','$fronter','$vendor_id','VDCL','$list_id','Y','$phone_code','$phone_number','$channel_group','$called_count','-5.00','$VLcomments'$entry_list_idSQLb);"; $affected_rows = $dbhA->do($stmtA); $dbhP=$dbhA; $mysql_count='02014'; $MEL_aff_rows=$affected_rows; &mysql_error_logging; $cbc=0; @@ -4196,8 +4218,14 @@ while ( ($drop_timer <= $DROP_TIME) && ($wait_in_queue > 0) && ($MCdrop_override # if callerid is not valid do not execute if ( ( length($phone_number) > 6 ) && ( $phone_number > 0) ) { + $entry_list_idSQLa=''; $entry_list_idSQLb=''; + if ( ($enable_did_entry_list_id > 0) && ($entry_list_id > 0) ) + { + $entry_list_idSQLa=',entry_list_id'; + $entry_list_idSQLb=",'$entry_list_id'"; + } ### insert a record into the vicidial_list table - $stmtA = "INSERT INTO vicidial_list (entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,called_since_last_reset,phone_code,phone_number,security_phrase,called_count,gmt_offset_now,comments) values('$SQLdate','$tsSQLdate','INBND','$fronter','$vendor_id','VDCL','$wait_time_option_callback_list_id','N','$phone_code','$phone_number','$channel_group','$called_count','$local_gmt','$VLcomments');"; + $stmtA = "INSERT INTO vicidial_list (entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,called_since_last_reset,phone_code,phone_number,security_phrase,called_count,gmt_offset_now,comments$entry_list_idSQLa) values('$SQLdate','$tsSQLdate','INBND','$fronter','$vendor_id','VDCL','$wait_time_option_callback_list_id','N','$phone_code','$phone_number','$channel_group','$called_count','$local_gmt','$VLcomments'$entry_list_idSQLb);"; $affected_rows = $dbhA->do($stmtA); $dbhP=$dbhA; $mysql_count='02089'; $MEL_aff_rows=$affected_rows; &mysql_error_logging; $stmtB = "SELECT LAST_INSERT_ID() LIMIT 1;"; @@ -4627,8 +4655,14 @@ while ( ($drop_timer <= $DROP_TIME) && ($wait_in_queue > 0) && ($MCdrop_override # if callerid is not valid do not execute if ( ( length($phone_number) > 6 ) && ( $phone_number > 0) ) { + $entry_list_idSQLa=''; $entry_list_idSQLb=''; + if ( ($enable_did_entry_list_id > 0) && ($entry_list_id > 0) ) + { + $entry_list_idSQLa=',entry_list_id'; + $entry_list_idSQLb=",'$entry_list_id'"; + } ### insert a record into the vicidial_list table - $stmtA = "INSERT INTO vicidial_list (entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,called_since_last_reset,phone_code,phone_number,security_phrase,called_count,gmt_offset_now,comments) values('$SQLdate','$tsSQLdate','INBND','$fronter','$vendor_id','VDCL','$hold_time_option_callback_list_id','N','$phone_code','$phone_number','$channel_group','$called_count','$local_gmt','$VLcomments');"; + $stmtA = "INSERT INTO vicidial_list (entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,called_since_last_reset,phone_code,phone_number,security_phrase,called_count,gmt_offset_now,comments$entry_list_idSQLa) values('$SQLdate','$tsSQLdate','INBND','$fronter','$vendor_id','VDCL','$hold_time_option_callback_list_id','N','$phone_code','$phone_number','$channel_group','$called_count','$local_gmt','$VLcomments'$entry_list_idSQLb);"; $affected_rows = $dbhA->do($stmtA); $dbhP=$dbhA; $mysql_count='02089'; $MEL_aff_rows=$affected_rows; &mysql_error_logging; $stmtB = "SELECT LAST_INSERT_ID() LIMIT 1;"; diff --git a/agc_2-X/trunk/bin/AST_recordings_export.pl b/agc_2-X/trunk/bin/AST_recordings_export.pl index 8a760a0f..6eeba3fe 100644 --- a/agc_2-X/trunk/bin/AST_recordings_export.pl +++ b/agc_2-X/trunk/bin/AST_recordings_export.pl @@ -722,11 +722,11 @@ else while ($sthArows > $rec_count) { @aryA = $sthA->fetchrow_array; - $lead_id = $aryA[0]; - $vicidial_id = $aryA[1]; - $uniqueid = $aryA[1]; - $length_in_sec = $aryA[2]; - $epoch = $aryA[3]; + $lead_id = $aryA[0]; + $vicidial_id = $aryA[1]; + $uniqueid = $aryA[1]; + $length_in_sec = $aryA[2]; + $epoch = $aryA[3]; $outbound = 'Y'; $domestic = 'Y'; @@ -753,12 +753,12 @@ else while ($sthArows > $rec_count) { @aryA = $sthA->fetchrow_array; - $lead_id = $aryA[0]; - $xfercallid = $aryA[1]; - $vicidial_id = $aryA[2]; - $uniqueid = $aryA[3]; - $length_in_sec = $aryA[4]; - $epoch = $aryA[5]; + $lead_id = $aryA[0]; + $xfercallid = $aryA[1]; + $vicidial_id = $aryA[2]; + $uniqueid = $aryA[3]; + $length_in_sec = $aryA[4]; + $epoch = $aryA[5]; $outbound = 'N'; $domestic = 'Y'; diff --git a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql index 9e36ca5b..487ca2ad 100644 --- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql @@ -1584,7 +1584,8 @@ allow_chats ENUM('0','1') default '0', enable_languages ENUM('0','1') default '0', language_method VARCHAR(20) default 'DISABLED', meetme_enter_login_filename VARCHAR(255) default '', -meetme_enter_leave3way_filename VARCHAR(255) default '' +meetme_enter_leave3way_filename VARCHAR(255) default '', +enable_did_entry_list_id ENUM('0','1') default '0' ) ENGINE=MyISAM; CREATE TABLE vicidial_campaigns_list_mix ( @@ -1891,6 +1892,8 @@ no_agent_ingroup_id VARCHAR(20) default '', no_agent_ingroup_extension VARCHAR(50) default '9998811112', pre_filter_phone_group_id VARCHAR(20) default '', pre_filter_extension VARCHAR(50) default '', +entry_list_id BIGINT(14) UNSIGNED default '0', +filter_entry_list_id BIGINT(14) UNSIGNED default '0', unique index (did_pattern), index (group_id) ) ENGINE=MyISAM; @@ -3334,8 +3337,8 @@ INSERT INTO vicidial_statuses (status,status_name,selectable,human_answered,cate INSERT INTO vicidial_statuses (status,status_name,selectable,human_answered,category,sale,dnc,customer_contact,not_interested,unworkable,scheduled_callback,completed) values('ADC','Disconnected Number Auto','N','N','UNDEFINED','N','N','N','N','Y','N','N'); INSERT INTO vicidial_statuses (status,status_name,selectable,human_answered,category,sale,dnc,customer_contact,not_interested,unworkable,scheduled_callback,completed) values('DEC','Declined Sale','Y','Y','UNDEFINED','N','N','Y','N','N','N','N'); INSERT INTO vicidial_statuses (status,status_name,selectable,human_answered,category,sale,dnc,customer_contact,not_interested,unworkable,scheduled_callback,completed) values('DNC','DO NOT CALL','Y','Y','UNDEFINED','N','Y','N','N','N','N','Y'); -INSERT INTO vicidial_statuses (status,status_name,selectable,human_answered,category,sale,dnc,customer_contact,not_interested,unworkable,scheduled_callback,completed) values('DNCL','DO NOT CALL Hopper Match','N','N','UNDEFINED','N','Y','N','N','N','N','Y'); -INSERT INTO vicidial_statuses (status,status_name,selectable,human_answered,category,sale,dnc,customer_contact,not_interested,unworkable,scheduled_callback,completed) values('DNCC','DO NOT CALL Camp Match','N','N','UNDEFINED','N','Y','N','N','N','N','Y'); +INSERT INTO vicidial_statuses (status,status_name,selectable,human_answered,category,sale,dnc,customer_contact,not_interested,unworkable,scheduled_callback,completed) values('DNCL','DO NOT CALL Hopper Sys Match','N','N','UNDEFINED','N','Y','N','N','N','N','Y'); +INSERT INTO vicidial_statuses (status,status_name,selectable,human_answered,category,sale,dnc,customer_contact,not_interested,unworkable,scheduled_callback,completed) values('DNCC','DO NOT CALL Hopper Camp Match','N','N','UNDEFINED','N','Y','N','N','N','N','Y'); INSERT INTO vicidial_statuses (status,status_name,selectable,human_answered,category,sale,dnc,customer_contact,not_interested,unworkable,scheduled_callback,completed) values('SALE','Sale Made','Y','Y','UNDEFINED','Y','N','N','N','N','N','Y'); INSERT INTO vicidial_statuses (status,status_name,selectable,human_answered,category,sale,dnc,customer_contact,not_interested,unworkable,scheduled_callback,completed) values('N','No Answer','Y','N','UNDEFINED','N','N','N','N','N','N','N'); INSERT INTO vicidial_statuses (status,status_name,selectable,human_answered,category,sale,dnc,customer_contact,not_interested,unworkable,scheduled_callback,completed) values('NI','Not Interested','Y','Y','UNDEFINED','N','N','Y','Y','N','N','N'); @@ -3372,4 +3375,4 @@ UPDATE vicidial_configuration set value='1766' where name='qc_database_version'; UPDATE system_settings set vdc_agent_api_active='1'; -UPDATE system_settings SET db_schema_version='1406',db_schema_update_date=NOW(),reload_timestamp=NOW(); +UPDATE system_settings SET db_schema_version='1407',db_schema_update_date=NOW(),reload_timestamp=NOW(); diff --git a/agc_2-X/trunk/extras/upgrade_2.12.sql b/agc_2-X/trunk/extras/upgrade_2.12.sql index b14b052c..d260d104 100644 --- a/agc_2-X/trunk/extras/upgrade_2.12.sql +++ b/agc_2-X/trunk/extras/upgrade_2.12.sql @@ -6,3 +6,10 @@ ALTER TABLE system_settings ADD meetme_enter_login_filename VARCHAR(255) default ALTER TABLE system_settings ADD meetme_enter_leave3way_filename VARCHAR(255) default ''; UPDATE system_settings SET db_schema_version='1406',db_schema_update_date=NOW() where db_schema_version < 1406; + +ALTER TABLE system_settings ADD enable_did_entry_list_id ENUM('0','1') default '0'; + +ALTER TABLE vicidial_inbound_dids ADD entry_list_id BIGINT(14) UNSIGNED default '0'; +ALTER TABLE vicidial_inbound_dids ADD filter_entry_list_id BIGINT(14) UNSIGNED default '0'; + +UPDATE system_settings SET db_schema_version='1407',db_schema_update_date=NOW() where db_schema_version < 1407; diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index 124e8be1..c310e36d 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -1902,6 +1902,12 @@ if (isset($_GET["meetme_enter_login_filename"])) {$meetme_enter_login_filename elseif (isset($_POST["meetme_enter_login_filename"])) {$meetme_enter_login_filename=$_POST["meetme_enter_login_filename"];} if (isset($_GET["meetme_enter_leave3way_filename"])) {$meetme_enter_leave3way_filename=$_GET["meetme_enter_leave3way_filename"];} elseif (isset($_POST["meetme_enter_leave3way_filename"])) {$meetme_enter_leave3way_filename=$_POST["meetme_enter_leave3way_filename"];} +if (isset($_GET["enable_did_entry_list_id"])) {$enable_did_entry_list_id=$_GET["enable_did_entry_list_id"];} + elseif (isset($_POST["enable_did_entry_list_id"])) {$enable_did_entry_list_id=$_POST["enable_did_entry_list_id"];} +if (isset($_GET["entry_list_id"])) {$entry_list_id=$_GET["entry_list_id"];} + elseif (isset($_POST["entry_list_id"])) {$entry_list_id=$_POST["entry_list_id"];} +if (isset($_GET["filter_entry_list_id"])) {$filter_entry_list_id=$_GET["filter_entry_list_id"];} + elseif (isset($_POST["filter_entry_list_id"])) {$filter_entry_list_id=$_POST["filter_entry_list_id"];} if (isset($script_id)) {$script_id= strtoupper($script_id);} @@ -1916,7 +1922,7 @@ if (strlen($dial_status) > 0) ############################################# ##### START SYSTEM_SETTINGS LOOKUP ##### -$stmt = "SELECT use_non_latin,enable_queuemetrics_logging,enable_vtiger_integration,qc_features_active,outbound_autodial_active,sounds_central_control_active,enable_second_webform,user_territories_active,custom_fields_enabled,admin_web_directory,webphone_url,first_login_trigger,hosted_settings,default_phone_registration_password,default_phone_login_password,default_server_password,test_campaign_calls,active_voicemail_server,voicemail_timezones,default_voicemail_timezone,default_local_gmt,campaign_cid_areacodes_enabled,pllb_grouping_limit,did_ra_extensions_enabled,expanded_list_stats,contacts_enabled,alt_log_server_ip,alt_log_dbname,alt_log_login,alt_log_pass,tables_use_alt_log_db,call_menu_qualify_enabled,admin_list_counts,allow_voicemail_greeting,svn_revision,allow_emails,level_8_disable_add,pass_key,pass_hash_enabled,disable_auto_dial,country_code_list_stats,frozen_server_call_clear,active_modules,enable_languages,language_method,meetme_enter_login_filename,meetme_enter_leave3way_filename FROM system_settings;"; +$stmt = "SELECT use_non_latin,enable_queuemetrics_logging,enable_vtiger_integration,qc_features_active,outbound_autodial_active,sounds_central_control_active,enable_second_webform,user_territories_active,custom_fields_enabled,admin_web_directory,webphone_url,first_login_trigger,hosted_settings,default_phone_registration_password,default_phone_login_password,default_server_password,test_campaign_calls,active_voicemail_server,voicemail_timezones,default_voicemail_timezone,default_local_gmt,campaign_cid_areacodes_enabled,pllb_grouping_limit,did_ra_extensions_enabled,expanded_list_stats,contacts_enabled,alt_log_server_ip,alt_log_dbname,alt_log_login,alt_log_pass,tables_use_alt_log_db,call_menu_qualify_enabled,admin_list_counts,allow_voicemail_greeting,svn_revision,allow_emails,level_8_disable_add,pass_key,pass_hash_enabled,disable_auto_dial,country_code_list_stats,frozen_server_call_clear,active_modules,enable_languages,language_method,meetme_enter_login_filename,meetme_enter_leave3way_filename,enable_did_entry_list_id FROM system_settings;"; $rslt=mysql_to_mysqli($stmt, $link); if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysqli_num_rows($rslt); @@ -1970,6 +1976,7 @@ if ($qm_conf_ct > 0) $SSlanguage_method = $row[44]; $SSmeetme_enter_login_filename = $row[45]; $SSmeetme_enter_leave3way_filename = $row[46]; + $SSenable_did_entry_list_id = $row[47]; } ##### END SETTINGS LOOKUP ##### ########################################### @@ -2246,6 +2253,9 @@ if ($non_latin < 1) $enable_languages = preg_replace('/[^0-9]/','',$enable_languages); $user_choose_language = preg_replace('/[^0-9]/','',$user_choose_language); $ignore_group_on_search = preg_replace('/[^0-9]/','',$ignore_group_on_search); + $enable_did_entry_list_id = preg_replace('/[^0-9]/','',$enable_did_entry_list_id); + $entry_list_id = preg_replace('/[^0-9]/','',$entry_list_id); + $filter_entry_list_id = preg_replace('/[^0-9]/','',$filter_entry_list_id); $drop_call_seconds = preg_replace('/[^-0-9]/','',$drop_call_seconds); $timer_alt_seconds = preg_replace('/[^-0-9]/','',$timer_alt_seconds); @@ -3448,12 +3458,13 @@ else # 150302-0951 - Release of 2.11 stable branch and raising trunk to 2.12 # 150307-1914 - Added login and leave3way custom sounds system settings options # 150313-0912 - Added DB Schema Version warning if mismatched with astguiclient.conf value +# 150404-0932 - Added enable_did_entry_list_id and related DID options # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 9 to access this page the first time -$admin_version = '2.12-479a'; -$build = '150313-0912'; +$admin_version = '2.12-480a'; +$build = '150404-0932'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -9462,7 +9473,7 @@ if ($ADD==2411) } else { - $stmt="INSERT INTO vicidial_inbound_dids (did_pattern,did_description,did_active,did_route,extension,exten_context,voicemail_ext,phone,server_ip,user,user_unavailable_action,user_route_settings_ingroup,group_id,call_handle_method,agent_search_method,list_id,campaign_id,phone_code,menu_id,record_call,filter_inbound_number,filter_phone_group_id,filter_url,filter_action,filter_extension,filter_exten_context,filter_voicemail_ext,filter_phone,filter_server_ip,filter_user,filter_user_unavailable_action,filter_user_route_settings_ingroup,filter_group_id,filter_call_handle_method,filter_agent_search_method,filter_list_id,filter_campaign_id,filter_phone_code,filter_menu_id,filter_clean_cid_number,custom_one,custom_two,custom_three,custom_four,custom_five,user_group,filter_dnc_campaign,filter_url_did_redirect,no_agent_ingroup_redirect,no_agent_ingroup_id,no_agent_ingroup_extension,pre_filter_phone_group_id,pre_filter_extension) SELECT \"$did_pattern\",\"$did_description\",did_active,did_route,extension,exten_context,voicemail_ext,phone,server_ip,user,user_unavailable_action,user_route_settings_ingroup,group_id,call_handle_method,agent_search_method,list_id,campaign_id,phone_code,menu_id,record_call,filter_inbound_number,filter_phone_group_id,filter_url,filter_action,filter_extension,filter_exten_context,filter_voicemail_ext,filter_phone,filter_server_ip,filter_user,filter_user_unavailable_action,filter_user_route_settings_ingroup,filter_group_id,filter_call_handle_method,filter_agent_search_method,filter_list_id,filter_campaign_id,filter_phone_code,filter_menu_id,filter_clean_cid_number,custom_one,custom_two,custom_three,custom_four,custom_five,user_group,filter_dnc_campaign,filter_url_did_redirect,no_agent_ingroup_redirect,no_agent_ingroup_id,no_agent_ingroup_extension,pre_filter_phone_group_id,pre_filter_extension from vicidial_inbound_dids where did_id=\"$source_did\";"; + $stmt="INSERT INTO vicidial_inbound_dids (did_pattern,did_description,did_active,did_route,extension,exten_context,voicemail_ext,phone,server_ip,user,user_unavailable_action,user_route_settings_ingroup,group_id,call_handle_method,agent_search_method,list_id,campaign_id,phone_code,menu_id,record_call,filter_inbound_number,filter_phone_group_id,filter_url,filter_action,filter_extension,filter_exten_context,filter_voicemail_ext,filter_phone,filter_server_ip,filter_user,filter_user_unavailable_action,filter_user_route_settings_ingroup,filter_group_id,filter_call_handle_method,filter_agent_search_method,filter_list_id,filter_campaign_id,filter_phone_code,filter_menu_id,filter_clean_cid_number,custom_one,custom_two,custom_three,custom_four,custom_five,user_group,filter_dnc_campaign,filter_url_did_redirect,no_agent_ingroup_redirect,no_agent_ingroup_id,no_agent_ingroup_extension,pre_filter_phone_group_id,pre_filter_extension,entry_list_id,filter_entry_list_id) SELECT \"$did_pattern\",\"$did_description\",did_active,did_route,extension,exten_context,voicemail_ext,phone,server_ip,user,user_unavailable_action,user_route_settings_ingroup,group_id,call_handle_method,agent_search_method,list_id,campaign_id,phone_code,menu_id,record_call,filter_inbound_number,filter_phone_group_id,filter_url,filter_action,filter_extension,filter_exten_context,filter_voicemail_ext,filter_phone,filter_server_ip,filter_user,filter_user_unavailable_action,filter_user_route_settings_ingroup,filter_group_id,filter_call_handle_method,filter_agent_search_method,filter_list_id,filter_campaign_id,filter_phone_code,filter_menu_id,filter_clean_cid_number,custom_one,custom_two,custom_three,custom_four,custom_five,user_group,filter_dnc_campaign,filter_url_did_redirect,no_agent_ingroup_redirect,no_agent_ingroup_id,no_agent_ingroup_extension,pre_filter_phone_group_id,pre_filter_extension,entry_list_id,filter_entry_list_id from vicidial_inbound_dids where did_id=\"$source_did\";"; $rslt=mysql_to_mysqli($stmt, $link); $stmt="SELECT did_id from vicidial_inbound_dids where did_pattern='$did_pattern';"; @@ -13334,9 +13345,14 @@ if ($ADD==4311) } else { + $did_entry_list_idSQL=''; + if ($SSenable_did_entry_list_id > 0) + { + $did_entry_list_idSQL=",entry_list_id='$entry_list_id',filter_entry_list_id='$filter_entry_list_id'"; + } echo "
"._QXZ("DID MODIFIED").": $did_pattern\n"; - $stmt="UPDATE vicidial_inbound_dids set did_pattern='$did_pattern',did_description='$did_description',did_active='$did_active',did_route='$did_route',extension='$extension',exten_context='$exten_context',voicemail_ext='$voicemail_ext',phone='$phone',server_ip='$server_ip',user='$user',user_unavailable_action='$user_unavailable_action',user_route_settings_ingroup='$user_route_settings_ingroup',group_id='$group_id',call_handle_method='$call_handle_method',agent_search_method='$agent_search_method',list_id='$list_id',campaign_id='$campaign_id',phone_code='$phone_code',menu_id='$menu_id',record_call='$record_call',filter_inbound_number='$filter_inbound_number',filter_phone_group_id='$filter_phone_group_id',filter_url='$filter_url',filter_action='$filter_action',filter_extension='$filter_extension',filter_exten_context='$filter_exten_context',filter_voicemail_ext='$filter_voicemail_ext',filter_phone='$filter_phone',filter_server_ip='$filter_server_ip',filter_user='$filter_user',filter_user_unavailable_action='$filter_user_unavailable_action',filter_user_route_settings_ingroup='$filter_user_route_settings_ingroup',filter_group_id='$filter_group_id',filter_call_handle_method='$filter_call_handle_method',filter_agent_search_method='$filter_agent_search_method',filter_list_id='$filter_list_id',filter_campaign_id='$filter_campaign_id',filter_phone_code='$filter_phone_code',filter_menu_id='$filter_menu_id',filter_clean_cid_number='$filter_clean_cid_number',custom_one='$custom_one',custom_two='$custom_two',custom_three='$custom_three',custom_four='$custom_four',custom_five='$custom_five',user_group='$user_group',filter_dnc_campaign='$filter_dnc_campaign',filter_url_did_redirect='$filter_url_did_redirect',no_agent_ingroup_redirect='$no_agent_ingroup_redirect',no_agent_ingroup_id='$no_agent_ingroup_id',no_agent_ingroup_extension='$no_agent_ingroup_extension',pre_filter_phone_group_id='$pre_filter_phone_group_id',pre_filter_extension='$pre_filter_extension' where did_id='$did_id';"; + $stmt="UPDATE vicidial_inbound_dids set did_pattern='$did_pattern',did_description='$did_description',did_active='$did_active',did_route='$did_route',extension='$extension',exten_context='$exten_context',voicemail_ext='$voicemail_ext',phone='$phone',server_ip='$server_ip',user='$user',user_unavailable_action='$user_unavailable_action',user_route_settings_ingroup='$user_route_settings_ingroup',group_id='$group_id',call_handle_method='$call_handle_method',agent_search_method='$agent_search_method',list_id='$list_id',campaign_id='$campaign_id',phone_code='$phone_code',menu_id='$menu_id',record_call='$record_call',filter_inbound_number='$filter_inbound_number',filter_phone_group_id='$filter_phone_group_id',filter_url='$filter_url',filter_action='$filter_action',filter_extension='$filter_extension',filter_exten_context='$filter_exten_context',filter_voicemail_ext='$filter_voicemail_ext',filter_phone='$filter_phone',filter_server_ip='$filter_server_ip',filter_user='$filter_user',filter_user_unavailable_action='$filter_user_unavailable_action',filter_user_route_settings_ingroup='$filter_user_route_settings_ingroup',filter_group_id='$filter_group_id',filter_call_handle_method='$filter_call_handle_method',filter_agent_search_method='$filter_agent_search_method',filter_list_id='$filter_list_id',filter_campaign_id='$filter_campaign_id',filter_phone_code='$filter_phone_code',filter_menu_id='$filter_menu_id',filter_clean_cid_number='$filter_clean_cid_number',custom_one='$custom_one',custom_two='$custom_two',custom_three='$custom_three',custom_four='$custom_four',custom_five='$custom_five',user_group='$user_group',filter_dnc_campaign='$filter_dnc_campaign',filter_url_did_redirect='$filter_url_did_redirect',no_agent_ingroup_redirect='$no_agent_ingroup_redirect',no_agent_ingroup_id='$no_agent_ingroup_id',no_agent_ingroup_extension='$no_agent_ingroup_extension',pre_filter_phone_group_id='$pre_filter_phone_group_id',pre_filter_extension='$pre_filter_extension'$did_entry_list_idSQL where did_id='$did_id';"; $rslt=mysql_to_mysqli($stmt, $link); ### LOG INSERTION Admin Log Table ### @@ -14868,7 +14884,7 @@ if ($ADD==411111111111111) $custom_dialplanSQL=''; if ($LOGmodify_custom_dialplans > 0) {$custom_dialplanSQL = ",custom_dialplan_entry='$custom_dialplan_entry'";} - $stmt="UPDATE system_settings set use_non_latin='$use_non_latin',webroot_writable='$webroot_writable',enable_queuemetrics_logging='$enable_queuemetrics_logging',queuemetrics_server_ip='$queuemetrics_server_ip',queuemetrics_dbname='$queuemetrics_dbname',queuemetrics_login='$queuemetrics_login',queuemetrics_pass='$queuemetrics_pass',queuemetrics_url='$queuemetrics_url',queuemetrics_log_id='$queuemetrics_log_id',queuemetrics_eq_prepend='$queuemetrics_eq_prepend',vicidial_agent_disable='$vicidial_agent_disable',allow_sipsak_messages='$allow_sipsak_messages',admin_home_url='$admin_home_url',enable_agc_xfer_log='$enable_agc_xfer_log',timeclock_end_of_day='$timeclock_end_of_day',vdc_header_date_format='$vdc_header_date_format',vdc_customer_date_format='$vdc_customer_date_format',vdc_header_phone_format='$vdc_header_phone_format',vdc_agent_api_active='$vdc_agent_api_active',enable_vtiger_integration='$enable_vtiger_integration',vtiger_server_ip='$vtiger_server_ip',vtiger_dbname='$vtiger_dbname',vtiger_login='$vtiger_login',vtiger_pass='$vtiger_pass',vtiger_url='$vtiger_url',qc_features_active='$qc_features_active',outbound_autodial_active='$outbound_autodial_active',outbound_calls_per_second='$outbound_calls_per_second',enable_tts_integration='$enable_tts_integration',agentonly_callback_campaign_lock='$agentonly_callback_campaign_lock',sounds_central_control_active='$sounds_central_control_active',sounds_web_server='$sounds_web_server',sounds_web_directory='$sounds_web_directory',active_voicemail_server='$active_voicemail_server',auto_dial_limit='$auto_dial_limit',user_territories_active='$user_territories_active',allow_custom_dialplan='$allow_custom_dialplan',enable_second_webform='$enable_second_webform',default_webphone='$default_webphone',default_external_server_ip='$default_external_server_ip',webphone_url='" . mysqli_real_escape_string($link, $webphone_url) . "',enable_agc_dispo_log='$enable_agc_dispo_log',queuemetrics_loginout='$queuemetrics_loginout',callcard_enabled='$callcard_enabled',queuemetrics_callstatus='$queuemetrics_callstatus',default_codecs='$default_codecs',admin_web_directory='$admin_web_directory',label_title='$label_title',label_first_name='$label_first_name',label_middle_initial='$label_middle_initial',label_last_name='$label_last_name',label_address1='$label_address1',label_address2='$label_address2',label_address3='$label_address3',label_city='$label_city',label_state='$label_state',label_province='$label_province',label_postal_code='$label_postal_code',label_vendor_lead_code='$label_vendor_lead_code',label_gender='$label_gender',label_phone_number='$label_phone_number',label_phone_code='$label_phone_code',label_alt_phone='$label_alt_phone',label_security_phrase='$label_security_phrase',label_email='$label_email',label_comments='$label_comments',custom_fields_enabled='$custom_fields_enabled',slave_db_server='$slave_db_server',reports_use_slave_db='$reports_use_slave_db',webphone_systemkey='$webphone_systemkey',first_login_trigger='$first_login_trigger',default_phone_registration_password='$default_phone_registration_password',default_phone_login_password='$default_phone_login_password',default_server_password='$default_server_password',admin_modify_refresh='$admin_modify_refresh',nocache_admin='$nocache_admin',generate_cross_server_exten='$generate_cross_server_exten',queuemetrics_addmember_enabled='$queuemetrics_addmember_enabled',queuemetrics_dispo_pause='$queuemetrics_dispo_pause',label_hide_field_logs='$label_hide_field_logs',queuemetrics_pe_phone_append='$queuemetrics_pe_phone_append',test_campaign_calls='$test_campaign_calls',agents_calls_reset='$agents_calls_reset',default_voicemail_timezone='$default_voicemail_timezone',default_local_gmt='$default_local_gmt',noanswer_log='$noanswer_log',alt_log_server_ip='$alt_log_server_ip',alt_log_dbname='$alt_log_dbname',alt_log_login='$alt_log_login',alt_log_pass='$alt_log_pass',tables_use_alt_log_db='$tables_use_alt_log_db',did_agent_log='$did_agent_log',campaign_cid_areacodes_enabled='$campaign_cid_areacodes_enabled',pllb_grouping_limit='$pllb_grouping_limit',did_ra_extensions_enabled='$did_ra_extensions_enabled',expanded_list_stats='$expanded_list_stats',contacts_enabled='$contacts_enabled',call_menu_qualify_enabled='$call_menu_qualify_enabled',admin_list_counts='$admin_list_counts',allow_voicemail_greeting='$allow_voicemail_greeting',queuemetrics_socket='$queuemetrics_socket',queuemetrics_socket_url='$queuemetrics_socket_url',enhanced_disconnect_logging='$enhanced_disconnect_logging',allow_emails='$allow_emails',level_8_disable_add='$level_8_disable_add',queuemetrics_record_hold='$queuemetrics_record_hold',country_code_list_stats='$country_code_list_stats',queuemetrics_pause_type='$queuemetrics_pause_type',frozen_server_call_clear='$frozen_server_call_clear',callback_time_24hour='$callback_time_24hour',enable_languages='$enable_languages',language_method='$language_method',meetme_enter_login_filename='$meetme_enter_login_filename',meetme_enter_leave3way_filename='$meetme_enter_leave3way_filename'$custom_dialplanSQL;"; + $stmt="UPDATE system_settings set use_non_latin='$use_non_latin',webroot_writable='$webroot_writable',enable_queuemetrics_logging='$enable_queuemetrics_logging',queuemetrics_server_ip='$queuemetrics_server_ip',queuemetrics_dbname='$queuemetrics_dbname',queuemetrics_login='$queuemetrics_login',queuemetrics_pass='$queuemetrics_pass',queuemetrics_url='$queuemetrics_url',queuemetrics_log_id='$queuemetrics_log_id',queuemetrics_eq_prepend='$queuemetrics_eq_prepend',vicidial_agent_disable='$vicidial_agent_disable',allow_sipsak_messages='$allow_sipsak_messages',admin_home_url='$admin_home_url',enable_agc_xfer_log='$enable_agc_xfer_log',timeclock_end_of_day='$timeclock_end_of_day',vdc_header_date_format='$vdc_header_date_format',vdc_customer_date_format='$vdc_customer_date_format',vdc_header_phone_format='$vdc_header_phone_format',vdc_agent_api_active='$vdc_agent_api_active',enable_vtiger_integration='$enable_vtiger_integration',vtiger_server_ip='$vtiger_server_ip',vtiger_dbname='$vtiger_dbname',vtiger_login='$vtiger_login',vtiger_pass='$vtiger_pass',vtiger_url='$vtiger_url',qc_features_active='$qc_features_active',outbound_autodial_active='$outbound_autodial_active',outbound_calls_per_second='$outbound_calls_per_second',enable_tts_integration='$enable_tts_integration',agentonly_callback_campaign_lock='$agentonly_callback_campaign_lock',sounds_central_control_active='$sounds_central_control_active',sounds_web_server='$sounds_web_server',sounds_web_directory='$sounds_web_directory',active_voicemail_server='$active_voicemail_server',auto_dial_limit='$auto_dial_limit',user_territories_active='$user_territories_active',allow_custom_dialplan='$allow_custom_dialplan',enable_second_webform='$enable_second_webform',default_webphone='$default_webphone',default_external_server_ip='$default_external_server_ip',webphone_url='" . mysqli_real_escape_string($link, $webphone_url) . "',enable_agc_dispo_log='$enable_agc_dispo_log',queuemetrics_loginout='$queuemetrics_loginout',callcard_enabled='$callcard_enabled',queuemetrics_callstatus='$queuemetrics_callstatus',default_codecs='$default_codecs',admin_web_directory='$admin_web_directory',label_title='$label_title',label_first_name='$label_first_name',label_middle_initial='$label_middle_initial',label_last_name='$label_last_name',label_address1='$label_address1',label_address2='$label_address2',label_address3='$label_address3',label_city='$label_city',label_state='$label_state',label_province='$label_province',label_postal_code='$label_postal_code',label_vendor_lead_code='$label_vendor_lead_code',label_gender='$label_gender',label_phone_number='$label_phone_number',label_phone_code='$label_phone_code',label_alt_phone='$label_alt_phone',label_security_phrase='$label_security_phrase',label_email='$label_email',label_comments='$label_comments',custom_fields_enabled='$custom_fields_enabled',slave_db_server='$slave_db_server',reports_use_slave_db='$reports_use_slave_db',webphone_systemkey='$webphone_systemkey',first_login_trigger='$first_login_trigger',default_phone_registration_password='$default_phone_registration_password',default_phone_login_password='$default_phone_login_password',default_server_password='$default_server_password',admin_modify_refresh='$admin_modify_refresh',nocache_admin='$nocache_admin',generate_cross_server_exten='$generate_cross_server_exten',queuemetrics_addmember_enabled='$queuemetrics_addmember_enabled',queuemetrics_dispo_pause='$queuemetrics_dispo_pause',label_hide_field_logs='$label_hide_field_logs',queuemetrics_pe_phone_append='$queuemetrics_pe_phone_append',test_campaign_calls='$test_campaign_calls',agents_calls_reset='$agents_calls_reset',default_voicemail_timezone='$default_voicemail_timezone',default_local_gmt='$default_local_gmt',noanswer_log='$noanswer_log',alt_log_server_ip='$alt_log_server_ip',alt_log_dbname='$alt_log_dbname',alt_log_login='$alt_log_login',alt_log_pass='$alt_log_pass',tables_use_alt_log_db='$tables_use_alt_log_db',did_agent_log='$did_agent_log',campaign_cid_areacodes_enabled='$campaign_cid_areacodes_enabled',pllb_grouping_limit='$pllb_grouping_limit',did_ra_extensions_enabled='$did_ra_extensions_enabled',expanded_list_stats='$expanded_list_stats',contacts_enabled='$contacts_enabled',call_menu_qualify_enabled='$call_menu_qualify_enabled',admin_list_counts='$admin_list_counts',allow_voicemail_greeting='$allow_voicemail_greeting',queuemetrics_socket='$queuemetrics_socket',queuemetrics_socket_url='$queuemetrics_socket_url',enhanced_disconnect_logging='$enhanced_disconnect_logging',allow_emails='$allow_emails',level_8_disable_add='$level_8_disable_add',queuemetrics_record_hold='$queuemetrics_record_hold',country_code_list_stats='$country_code_list_stats',queuemetrics_pause_type='$queuemetrics_pause_type',frozen_server_call_clear='$frozen_server_call_clear',callback_time_24hour='$callback_time_24hour',enable_languages='$enable_languages',language_method='$language_method',meetme_enter_login_filename='$meetme_enter_login_filename',meetme_enter_leave3way_filename='$meetme_enter_leave3way_filename',enable_did_entry_list_id='$enable_did_entry_list_id'$custom_dialplanSQL;"; $rslt=mysql_to_mysqli($stmt, $link); if ( ($meetme_enter_login_filename != $SSmeetme_enter_login_filename) or ($meetme_enter_leave3way_filename != $SSmeetme_enter_leave3way_filename) ) @@ -25551,7 +25567,7 @@ if ($ADD==3311) $didSQL = "did_id='$did_id'"; if ( (strlen($did_id)<1) and (strlen($did_pattern)>0) ) {$didSQL = "did_pattern='$did_pattern'";} - $stmt="SELECT did_id,did_pattern,did_description,did_active,did_route,extension,exten_context,voicemail_ext,phone,server_ip,user,user_unavailable_action,user_route_settings_ingroup,group_id,call_handle_method,agent_search_method,list_id,campaign_id,phone_code,menu_id,record_call,filter_inbound_number,filter_phone_group_id,filter_url,filter_action,filter_extension,filter_exten_context,filter_voicemail_ext,filter_phone,filter_server_ip,filter_user,filter_user_unavailable_action,filter_user_route_settings_ingroup,filter_group_id,filter_call_handle_method,filter_agent_search_method,filter_list_id,filter_campaign_id,filter_phone_code,filter_menu_id,filter_clean_cid_number,custom_one,custom_two,custom_three,custom_four,custom_five,user_group,filter_dnc_campaign,filter_url_did_redirect,no_agent_ingroup_redirect,no_agent_ingroup_id,no_agent_ingroup_extension,pre_filter_phone_group_id,pre_filter_extension from vicidial_inbound_dids where $didSQL $LOGadmin_viewable_groupsSQL;"; + $stmt="SELECT did_id,did_pattern,did_description,did_active,did_route,extension,exten_context,voicemail_ext,phone,server_ip,user,user_unavailable_action,user_route_settings_ingroup,group_id,call_handle_method,agent_search_method,list_id,campaign_id,phone_code,menu_id,record_call,filter_inbound_number,filter_phone_group_id,filter_url,filter_action,filter_extension,filter_exten_context,filter_voicemail_ext,filter_phone,filter_server_ip,filter_user,filter_user_unavailable_action,filter_user_route_settings_ingroup,filter_group_id,filter_call_handle_method,filter_agent_search_method,filter_list_id,filter_campaign_id,filter_phone_code,filter_menu_id,filter_clean_cid_number,custom_one,custom_two,custom_three,custom_four,custom_five,user_group,filter_dnc_campaign,filter_url_did_redirect,no_agent_ingroup_redirect,no_agent_ingroup_id,no_agent_ingroup_extension,pre_filter_phone_group_id,pre_filter_extension,entry_list_id,filter_entry_list_id from vicidial_inbound_dids where $didSQL $LOGadmin_viewable_groupsSQL;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_to_mysqli($stmt, $link); $row=mysqli_fetch_row($rslt); @@ -25609,6 +25625,8 @@ if ($ADD==3311) $no_agent_ingroup_extension = $row[51]; $pre_filter_phone_group_id = $row[52]; $pre_filter_extension = $row[53]; + $entry_list_id = $row[54]; + $filter_entry_list_id = $row[55]; $stmt="SELECT campaign_id,campaign_name from vicidial_campaigns $whereLOGallowed_campaignsSQL order by campaign_id;"; $rslt=mysql_to_mysqli($stmt, $link); @@ -25760,6 +25778,12 @@ if ($ADD==3311) echo ""._QXZ("In-Group Call Handle Method").": $NWB#inbound_dids-call_handle_method$NWE\n"; echo ""._QXZ("In-Group Agent Search Method").": $NWB#inbound_dids-agent_search_method$NWE\n"; echo ""._QXZ("In-Group List ID").": $NWB#inbound_dids-list_id$NWE\n"; + + if ($SSenable_did_entry_list_id > 0) + { + echo ""._QXZ("In-Group Entry List ID").": $NWB#inbound_dids-entry_list_id$NWE\n"; + } + echo ""._QXZ("In-Group Campaign ID").": $NWB#inbound_dids-call_handle_method$NWE\n"; echo ""._QXZ("Filter In-Group Agent Search Method").": $NWB#inbound_dids-agent_search_method$NWE\n"; echo ""._QXZ("Filter In-Group List ID").": $NWB#inbound_dids-list_id$NWE\n"; + + if ($SSenable_did_entry_list_id > 0) + { + echo ""._QXZ("Filter In-Group Entry List ID").": $NWB#inbound_dids-entry_list_id$NWE\n"; + } + echo ""._QXZ("Filter In-Group Campaign ID").": $NWB#settings-country_code_list_stats$NWE\n"; + echo ""._QXZ("Enable DID Entry List ID").": $NWB#settings-enable_did_entry_list_id$NWE\n"; + echo ""._QXZ("Enhanced Disconnect Logging").": $NWB#settings-enhanced_disconnect_logging$NWE\n"; echo ""._QXZ("Enable Campaign Areacode CID").": $NWB#settings-campaign_cid_areacodes_enabled$NWE\n"; diff --git a/agc_2-X/trunk/www/vicidial/help.php b/agc_2-X/trunk/www/vicidial/help.php index 6550ba0a..a0682b0f 100644 --- a/agc_2-X/trunk/www/vicidial/help.php +++ b/agc_2-X/trunk/www/vicidial/help.php @@ -42,6 +42,7 @@ # 150218-0800 - Added Callbacks Bulk Move help # 150223-1548 - Added DYN option to am_message_exten # 150307-2317 - Added custom meetme enter options +# 150404-0934 - Added enable_did_entry_list_id and related DID options # require("dbconnect_mysqli.php"); @@ -2674,6 +2675,11 @@ if ($SSqc_features_active > 0)
- +
+ +
+ - +

@@ -4663,6 +4669,11 @@ FR_SPAC 00 00 00 00 00 - - +
+ +
+ - +