ViciDial/agc_2-X
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added disable_user_group_bulk_change option to options.php

Browse Source 
Added on_hook_cid_number setting to in-groups

git-svn-id: svn://192.168.202.10@2460 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2016-01-06 19:36:32 +00:00
parent ad8ce7d434
commit 8c815570cf
8 changed files with 68 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UPGRADE
+2
View File
@@ -228,6 +228,8 @@ OTHER CHANGES:
57. Added option to Inbound DID Group Filtering to filter by areacode.
58. Added in-group option for On-Hook CID Number.
agi/agi-VDAD_ALL_inbound.agi
+19 -3
View File
@@ -725,7 +725,7 @@ $affected_rows = $dbhA->do($stmtA);
### Grab inbound groups values from the database
$cbc=0;
$stmtA = "SELECT call_time_id,after_hours_action,after_hours_message_filename,after_hours_exten,after_hours_voicemail,welcome_message_filename,moh_context,onhold_prompt_filename,prompt_interval,agent_alert_exten,agent_alert_delay,drop_call_seconds,drop_action,drop_exten,next_agent_call,voicemail_ext,queue_priority,drop_inbound_group,afterhours_xfer_group,play_place_in_line,play_estimate_hold_time,hold_time_option,hold_time_option_seconds,hold_time_option_exten,hold_time_option_voicemail,hold_time_option_xfer_group,hold_time_option_callback_filename,hold_time_option_callback_list_id,hold_recall_xfer_group,no_delay_call_route,play_welcome_message,no_agent_no_queue,no_agent_action,no_agent_action_value,extension_appended_cidname,uniqueid_status_display,uniqueid_status_prefix,hold_time_option_minimum,hold_time_option_press_filename,hold_time_option_callmenu,onhold_prompt_no_block,onhold_prompt_seconds,hold_time_option_no_block,hold_time_option_prompt_seconds,hold_time_second_option,hold_time_third_option,wait_hold_option_priority,wait_time_option,wait_time_second_option,wait_time_third_option,wait_time_option_seconds,wait_time_option_exten,wait_time_option_voicemail,wait_time_option_xfer_group,wait_time_option_callmenu,wait_time_option_callback_filename,wait_time_option_callback_list_id,wait_time_option_press_filename,wait_time_option_no_block,wait_time_option_prompt_seconds,active,calculate_estimated_hold_seconds,add_lead_url,eht_minimum_prompt_filename,eht_minimum_prompt_no_block,eht_minimum_prompt_seconds,on_hook_ring_time,ingroup_recording_override,ingroup_rec_filename,on_hook_cid,action_xfer_cid,drop_callmenu,after_hours_callmenu,max_calls_method,max_calls_count,max_calls_action,populate_lead_ingroup,na_call_url,drop_lead_reset,after_hours_lead_reset,nanq_lead_reset,wait_time_lead_reset,hold_time_lead_reset,routing_initiated_recordings FROM vicidial_inbound_groups where group_id = '$channel_group';";
$stmtA = "SELECT call_time_id,after_hours_action,after_hours_message_filename,after_hours_exten,after_hours_voicemail,welcome_message_filename,moh_context,onhold_prompt_filename,prompt_interval,agent_alert_exten,agent_alert_delay,drop_call_seconds,drop_action,drop_exten,next_agent_call,voicemail_ext,queue_priority,drop_inbound_group,afterhours_xfer_group,play_place_in_line,play_estimate_hold_time,hold_time_option,hold_time_option_seconds,hold_time_option_exten,hold_time_option_voicemail,hold_time_option_xfer_group,hold_time_option_callback_filename,hold_time_option_callback_list_id,hold_recall_xfer_group,no_delay_call_route,play_welcome_message,no_agent_no_queue,no_agent_action,no_agent_action_value,extension_appended_cidname,uniqueid_status_display,uniqueid_status_prefix,hold_time_option_minimum,hold_time_option_press_filename,hold_time_option_callmenu,onhold_prompt_no_block,onhold_prompt_seconds,hold_time_option_no_block,hold_time_option_prompt_seconds,hold_time_second_option,hold_time_third_option,wait_hold_option_priority,wait_time_option,wait_time_second_option,wait_time_third_option,wait_time_option_seconds,wait_time_option_exten,wait_time_option_voicemail,wait_time_option_xfer_group,wait_time_option_callmenu,wait_time_option_callback_filename,wait_time_option_callback_list_id,wait_time_option_press_filename,wait_time_option_no_block,wait_time_option_prompt_seconds,active,calculate_estimated_hold_seconds,add_lead_url,eht_minimum_prompt_filename,eht_minimum_prompt_no_block,eht_minimum_prompt_seconds,on_hook_ring_time,ingroup_recording_override,ingroup_rec_filename,on_hook_cid,action_xfer_cid,drop_callmenu,after_hours_callmenu,max_calls_method,max_calls_count,max_calls_action,populate_lead_ingroup,na_call_url,drop_lead_reset,after_hours_lead_reset,nanq_lead_reset,wait_time_lead_reset,hold_time_lead_reset,routing_initiated_recordings,on_hook_cid_number FROM vicidial_inbound_groups where group_id = '$channel_group';";
$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
$sthArows=$sthA->rows;
@@ -824,6 +824,7 @@ if ($sthArows > 0)
$wait_time_lead_reset = $aryA[81];
$hold_time_lead_reset = $aryA[82];
$routing_initiated_recordings = $aryA[83];
$on_hook_cid_number = $aryA[84];
$custom_call_id='';
if ($uniqueid_status_display =~ /ENABLED/)
@@ -3001,10 +3002,25 @@ while ( ($drop_timer <= $DROP_TIME) && ($wait_in_queue > 0) && ($MCdrop_override
$RA_channel_group = $channel_group; while (length($RA_channel_group) > 10) {chop($RA_channel_group);}
$RINGALLqueryCID = "$RA_channel_group$phone_number";
}
$stmtA = "INSERT INTO vicidial_manager values('','','$SQLdate','NEW','N','$VARserver_ip','','Originate','$RINGALLqueryCID','Exten: $RINGALLexten','Context: default','Channel: $ring_all_DIALstr[$ragp]','Priority: 1','Callerid: $RINGALLqueryCID','Timeout: $commandTEMPon_hook_ring_time','','','','')";
$RINGALLqueryCIDfull = $RINGALLqueryCID;
if (length($on_hook_cid_number) > 0)
{
if ($on_hook_cid_number =~ /^Y|^YES|^CUSTOMER/)
{
$RINGALLqueryCIDfull = "\"$RINGALLqueryCID\" <$phone_number>";
}
else
{
if ($on_hook_cid_number =~ /\d\d\d\d\d\d/)
{
$RINGALLqueryCIDfull = "\"$RINGALLqueryCID\" <$on_hook_cid_number>";
}
}
}
$stmtA = "INSERT INTO vicidial_manager values('','','$SQLdate','NEW','N','$VARserver_ip','','Originate','$RINGALLqueryCID','Exten: $RINGALLexten','Context: default','Channel: $ring_all_DIALstr[$ragp]','Priority: 1','Callerid: $RINGALLqueryCIDfull','Timeout: $commandTEMPon_hook_ring_time','','','','')";
$affected_rows = $dbhA->do($stmtA);
$dbhP=$dbhA; $mysql_count='02168'; $MEL_aff_rows=$affected_rows; &mysql_error_logging;
if ($AGILOG) {$agi_string = "RING-AGENT CALL SENT: |$RINGALLqueryCID|$RINGALLexten|$ragp|$TEMPon_hook_ring_time $channel|$callerid"; &agi_output;}
if ($AGILOG) {$agi_string = "RING-AGENT CALL SENT: |$RINGALLqueryCID|$RINGALLexten|$ragp|$TEMPon_hook_ring_time|$on_hook_cid|$on_hook_cid_number| $channel|$callerid"; &agi_output;}
}
$ragp++;
}
extras/MySQL_AST_CREATE_tables.sql
+3 -2
View File
@@ -1169,7 +1169,8 @@ nanq_lead_reset ENUM('Y','N') default 'N',
wait_time_lead_reset ENUM('Y','N') default 'N',
hold_time_lead_reset ENUM('Y','N') default 'N',
status_group_id VARCHAR(20) default '',
routing_initiated_recordings ENUM('Y','N') default 'N'
routing_initiated_recordings ENUM('Y','N') default 'N',
on_hook_cid_number VARCHAR(18) default ''
) ENGINE=MyISAM;
CREATE TABLE vicidial_stations (
@@ -3689,4 +3690,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='1448',db_schema_update_date=NOW(),reload_timestamp=NOW();
UPDATE system_settings SET db_schema_version='1449',db_schema_update_date=NOW(),reload_timestamp=NOW();
extras/upgrade_2.12.sql
+4
View File
@@ -473,3 +473,7 @@ UPDATE system_settings SET db_schema_version='1447',db_schema_update_date=NOW()
ALTER TABLE vicidial_inbound_dids MODIFY filter_inbound_number ENUM('DISABLED','GROUP','URL','DNC_INTERNAL','DNC_CAMPAIGN','GROUP_AREACODE') default 'DISABLED';
UPDATE system_settings SET db_schema_version='1448',db_schema_update_date=NOW() where db_schema_version < 1448;
ALTER TABLE vicidial_inbound_groups ADD on_hook_cid_number VARCHAR(18) default '';
UPDATE system_settings SET db_schema_version='1449',db_schema_update_date=NOW() where db_schema_version < 1449;
www/vicidial/admin.php
+14 -7
View File
File diff suppressed because one or more lines are too long
www/vicidial/help.php
+6
View File
@@ -76,6 +76,7 @@
# 151231-0839 - Added user_groups-agent_allowed_chat_groups entry
# 160101-0933 - Added entries for routing_initiated_recordings in campaigns and in-groups
# 160106-0700 - Added AREACODE description to the inbound_dids-filter_inbound_number entry
# 160106-1348 - Added inbound_groups-on_hook_cid_number entry
#
@@ -2224,6 +2225,11 @@ if ($SSqc_features_active > 0)
<BR>
<B><?php echo _QXZ("On-Hook CID"); ?> -</B><?php echo _QXZ("This option is only used for agents that are logged in with phones that have the agent-on-hook feature enabled. This is the caller ID that will show up on their agent phones when the calls are ringing. GENERIC is a generic RINGAGENT00000000001 type of notification. INGROUP will show only the in-group the call came from. CUSTOMER_PHONE will show only the customer phone number. CUSTOMER_PHONE_RINGAGENT will show RINGAGENT_3125551212 with the RINGAGENT as part of the CID with the customer phone number. CUSTOMER_PHONE_INGROUP will show the first 10 characters of the in-group followed by the customer phone number. Default is GENERIC."); ?>
<BR>
<A NAME="inbound_groups-on_hook_cid_number">
<BR>
<B><?php echo _QXZ("On-Hook CID Number"); ?> -</B><?php echo _QXZ("This option allows you to set a CID Number to be sent out with the On-Hook CID. If you put a Y, YES or CUSTOMER in this field, then the customer CID number will be sent to the ringing agent phone. If you put a different phone number, that number will be sent. Default is blank for disabled."); ?>
<BR>
<A NAME="inbound_groups-queue_priority">
<BR>
www/vicidial/options-example.php
+4
View File
@@ -19,6 +19,7 @@
# 150619-0135 - Added DROPANSWERpercent_adjustment options.php option for AST_VDADstats.php
# 150909-1417 - Added $active_only_default_campaigns option for admin.php
# 160102-1249 - Added htmlconvert option for modify lead pages
# 160106-1321 - Added disable_user_group_bulk_change option
#
# used by the realtime_report.php script
@@ -93,4 +94,7 @@ $active_only_default_campaigns = 0;
# convert data to html readable in modify lead page fields
$htmlconvert=1;
# disable the user_group_bulk_change.php utility
$disable_user_group_bulk_change=0;
?>
www/vicidial/user_group_bulk_change.php
+16 -3
View File
@@ -16,6 +16,7 @@
# 141007-2112 - Finalized adding QXZ translation to all admin files
# 141229-1820 - Added code for on-the-fly language translations display
# 160105-1232 - Fixed SQL errors
# 160106-1318 - Added options.php option to disable this utility
#
header ("Content-type: text/html; charset=utf-8");
@@ -75,6 +76,12 @@ $date = date("r");
$ip = getenv("REMOTE_ADDR");
$browser = getenv("HTTP_USER_AGENT");
$disable_user_group_bulk_change=0;
if (file_exists('options.php'))
{
require('options.php');
}
$stmt="SELECT selected_language from vicidial_users where user='$PHP_AUTH_USER';";
if ($DB) {echo "|$stmt|\n";}
$rslt=mysql_to_mysqli($stmt, $link);
@@ -189,14 +196,20 @@ require("admin_header.php");
?>
<CENTER>
<TABLE WIDTH=620 BGCOLOR=#D9E6FE cellpadding=2 cellspacing=0><TR BGCOLOR=#015B91><TD ALIGN=LEFT><FONT FACE="ARIAL,HELVETICA" COLOR=WHITE SIZE=2><B> &nbsp; .<?php echo
<TABLE WIDTH=620 BGCOLOR=#D9E6FE cellpadding=2 cellspacing=0><TR BGCOLOR=#015B91><TD ALIGN=LEFT><FONT FACE="ARIAL,HELVETICA" COLOR=WHITE SIZE=2><B> &nbsp; <?php echo
_QXZ("User Group Bulk Change"); ?></TD><TD ALIGN=RIGHT><FONT FACE="ARIAL,HELVETICA" COLOR=WHITE SIZE=2><B> &nbsp; </TD></TR>
<?php
if ($disable_user_group_bulk_change > 0)
{
echo "<TR BGCOLOR=\"#F0F5FE\"><TD ALIGN=LEFT COLSPAN=2><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK SIZE=3><B> &nbsp; \n";
echo _QXZ("This utility has been disabled")."\n";
echo "</TD></TR><TABLE></body></html>\n";
exit;
}
echo "<TR BGCOLOR=\"#F0F5FE\"><TD ALIGN=LEFT COLSPAN=2><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK SIZE=3><B> &nbsp; \n";
##### GROUP CHANGE FOR ALL USERS IN A USER GROUP #####