From c709912e139275e2fbd4cfd8c2a8d9a4e288a5b8 Mon Sep 17 00:00:00 2001 From: mattf Date: Sat, 21 Apr 2018 03:29:19 +0000 Subject: [PATCH] admin.php help fixes Conf update script Fix for high-volume systems, added varibles to hangup queryCID git-svn-id: svn://192.168.202.10@2969 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/bin/AST_conf_update.pl | 15 +++++++++++---- agc_2-X/trunk/bin/AST_conf_update_3way.pl | 13 ++++++++++--- agc_2-X/trunk/docs/CALLER_ID_NAME_CODES.txt | 5 +++-- agc_2-X/trunk/www/vicidial/admin.php | 12 ++++++------ agc_2-X/trunk/www/vicidial/help.php | 19 +++++++++++++++++++ 5 files changed, 49 insertions(+), 15 deletions(-) diff --git a/agc_2-X/trunk/bin/AST_conf_update.pl b/agc_2-X/trunk/bin/AST_conf_update.pl index bc1eb8fe..41d98fb9 100644 --- a/agc_2-X/trunk/bin/AST_conf_update.pl +++ b/agc_2-X/trunk/bin/AST_conf_update.pl @@ -4,7 +4,7 @@ # # This script checks if there are channels in reserved conferences # -# Copyright (C) 2017 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2018 Matt Florell LICENSE: AGPLv2 # # 50810-1532 - Added database server variable definitions lookup # 50823-1456 - Added commandline arguments for debug at runtime @@ -19,6 +19,7 @@ # 130108-1712 - Changes for Asterisk 1.8 compatibility # 150610-1200 - Added support for AMI version 1.3 # 170916-0947 - Added support for AMI version 2+ +# 180420-2302 - Fix for high-volume systems, added varibles to hangup queryCID # # constants @@ -184,7 +185,9 @@ if ($Thour < 10) {$Thour = "0$Thour";} if ($Tmin < 10) {$Tmin = "0$Tmin";} if ($Tsec < 10) {$Tsec = "0$Tsec";} $TDSQLdate = "$Tyear-$Tmon-$Tmday $Thour:$Tmin:$Tsec"; -$TDnum = "$Tyear$Tmon$Tmday$Thour$Tmin$Tsec"; +$TDrand = int( rand(99)) + 100; +$TDnum = "$Tmon$Tmday$Thour$Tmin$Tsec$TDrand"; +$TDinc = 1; ###################################################################### ##### CLEAR vicidial_conferences ENTRIES IN LEAVE-3WAY FOR MORE THAN ONE HOUR @@ -211,7 +214,8 @@ while ($k < $rec_count) $local_DEF = 'Local/5555'; $local_AMP = '@'; $kick_local_channel = "$local_DEF$PT_conf_extens[$k]$local_AMP$ext_context"; - $queryCID = "ULGC35$TDnum"; + $padTDinc = sprintf("%03s", $TDinc); while (length($padTDinc) > 3) {chop($padTDinc);} + $queryCID = "ULGH$padTDinc$TDnum"; $stmtA="INSERT INTO vicidial_manager values('','','$now_date','NEW','N','$server_ip','','Originate','$queryCID','Channel: $kick_local_channel','Context: $ext_context','Exten: 8300','Priority: 1','Callerid: $queryCID','','','','','');"; $affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:|$stmtA|\n"; @@ -221,6 +225,7 @@ while ($k < $rec_count) $affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:|$stmtA|\n"; $k++; + $TDinc++; } @@ -358,11 +363,13 @@ if ($no_vc_3way_check < 1) $local_DEF = 'Local/5555'; $local_AMP = '@'; $kick_local_channel = "$local_DEF$PT_conf_extens[$i]$local_AMP$ext_context"; - $queryCID = "ULGC36$TDnum"; + $padTDinc = sprintf("%03s", $TDinc); while (length($padTDinc) > 3) {chop($padTDinc);} + $queryCID = "ULGC$padTDinc$TDnum"; $stmtA="INSERT INTO vicidial_manager values('','','$now_date','NEW','N','$server_ip','','Originate','$queryCID','Channel: $kick_local_channel','Context: $ext_context','Exten: 8300','Priority: 1','Callerid: $queryCID','','','','','');"; $affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:|$stmtA|\n"; if($DB){print STDERR "\n|$affected_rows|$stmtA|\n";} + $TDinc++; } $stmtA = "UPDATE vicidial_conferences set extension='$NEWexten[$i]',leave_3way='$leave_3waySQL' where server_ip='$server_ip' and conf_exten='$PT_conf_extens[$i]';"; diff --git a/agc_2-X/trunk/bin/AST_conf_update_3way.pl b/agc_2-X/trunk/bin/AST_conf_update_3way.pl index b89e7fe3..6dfaf0a7 100644 --- a/agc_2-X/trunk/bin/AST_conf_update_3way.pl +++ b/agc_2-X/trunk/bin/AST_conf_update_3way.pl @@ -11,7 +11,7 @@ # script's crontab entry that does some of these functions: # AST_conf_update.pl --no-vc-3way-check # -# Copyright (C) 2017 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2018 Matt Florell LICENSE: AGPLv2 # # 100811-2119 - First build, based upon AST_conf_update.pl script # 100928-1506 - Changed from hard-coded 60 minute limit to servers.vicidial_recording_limit @@ -19,6 +19,8 @@ # 160608-1549 - Added support for AMI version 1.3 # 170222-0939 - Changed to file logging using server settings # 170921-1814 - Added support for AMI2 +# 180420-2301 - Fix for high-volume systems, added varibles to hangup queryCID +# # constants $DB=0; # Debug flag @@ -228,7 +230,9 @@ while ($loops > $loop_counter) if ($Tmin < 10) {$Tmin = "0$Tmin";} if ($Tsec < 10) {$Tsec = "0$Tsec";} $TDSQLdate = "$Tyear-$Tmon-$Tmday $Thour:$Tmin:$Tsec"; - $TDnum = "$Tyear$Tmon$Tmday$Thour$Tmin$Tsec"; + $TDrand = int( rand(99)) + 100; + $TDnum = "$Tmon$Tmday$Thour$Tmin$Tsec$TDrand"; + $TDinc = 1; ###################################################################### @@ -368,12 +372,15 @@ while ($loops > $loop_counter) $local_DEF = 'Local/5555'; $local_AMP = '@'; $kick_local_channel = "$local_DEF$PT_conf_extens[$i]$local_AMP$ext_context"; - $queryCID = "ULGC36$TDnum"; + $padTDinc = sprintf("%03s", $TDinc); while (length($padTDinc) > 3) {chop($padTDinc);} + $queryCID = "ULGC$padTDinc$TDnum"; $stmtA="INSERT INTO vicidial_manager values('','','$now_date','NEW','N','$server_ip','','Originate','$queryCID','Channel: $kick_local_channel','Context: $ext_context','Exten: 8300','Priority: 1','Callerid: $queryCID','','','','','');"; $affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:|$stmtA|\n"; $event_string = "|$affected_rows|$stmtA|"; &event_logger; + + $TDinc++; } $stmtA = "UPDATE vicidial_conferences set extension='$NEWexten[$i]',leave_3way='$leave_3waySQL' where server_ip='$server_ip' and conf_exten='$PT_conf_extens[$i]';"; diff --git a/agc_2-X/trunk/docs/CALLER_ID_NAME_CODES.txt b/agc_2-X/trunk/docs/CALLER_ID_NAME_CODES.txt index 518d27e7..258551f1 100644 --- a/agc_2-X/trunk/docs/CALLER_ID_NAME_CODES.txt +++ b/agc_2-X/trunk/docs/CALLER_ID_NAME_CODES.txt @@ -1,4 +1,4 @@ -CALLER ID NAME CODES DOC Started: 2013-07-15 Updated: 2018-01-23 +CALLER ID NAME CODES DOC Started: 2013-07-15 Updated: 2018-04-20 This document is meant for reference only, and it does not contain all CID name codes possible, but more will be added over time. @@ -22,7 +22,8 @@ XBvdc - Agent blind transfer (XBvdcW14528875091001100110011001) [epoch + user... AGMON - Remote Agent Monitor (AGMON715224918000001) HLvdcW - Hangup of customer call from agent screen (HLvdcW1475524272tluc) CH123456 - Hangup of all non-agent channels in meetme session(CH1234614755246080) -ULGC - Hangup of lone channel in left 3way session (ULGC3620170222100923) +ULGC - Hangup of lone channel in left 3way session (ULGC0010420221616133) +ULGH - Clearing of left 3way session after server rec limit (ULGH0010420221618178) BM - Real-time screen blind monitor (BM149425456200006666) BB - Real-time screen blind barge (BB149425456200006666) BW - Real-time screen blind whisper (BW149425456200006666) diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index aa61254d..4e8a66d9 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -21141,7 +21141,7 @@ if ($ADD==3) echo ""._QXZ("Force Change Password").": $NWB#users-force_change_password$NWE\n"; - echo ""._QXZ("Last Login Info").": $last_login_date - $failed_login_count - $last_ip$NWB#users-user$NWE\n"; + echo ""._QXZ("Last Login Info").": $last_login_date - $failed_login_count - $last_ip$NWB#users-last_login_date$NWE\n"; echo ""._QXZ("Full Name").": $NWB#users-full_name$NWE\n"; echo ""._QXZ("User Level").": $NWB#users-custom_one$NWE\n"; - echo ""._QXZ("Custom")." 2: $NWB#users-custom_two$NWE\n"; - echo ""._QXZ("Custom")." 3: $NWB#users-custom_three$NWE\n"; - echo ""._QXZ("Custom")." 4: $NWB#users-custom_four$NWE\n"; - echo ""._QXZ("Custom")." 5: $NWB#users-custom_five$NWE\n"; + echo ""._QXZ("Custom")." 2: $NWB#users-custom_one$NWE\n"; + echo ""._QXZ("Custom")." 3: $NWB#users-custom_one$NWE\n"; + echo ""._QXZ("Custom")." 4: $NWB#users-custom_one$NWE\n"; + echo ""._QXZ("Custom")." 5: $NWB#users-custom_one$NWE\n"; if ($SSqc_features_active > 0) { @@ -22559,7 +22559,7 @@ if ($ADD==31) echo ""._QXZ("Automatic Hopper Level").": $NWB#campaigns-use_auto_hopper$NWE\n"; - echo ""._QXZ("Automatic Hopper Multiplier").": $NWB#campaigns-hopper_level$NWE\n"; + echo ""._QXZ("Automatic Hopper Multiplier").": $NWB#campaigns-auto_hopper_multi$NWE\n"; echo ""._QXZ("Auto Trim Hopper").": $NWB#campaigns-auto_trim_hopper$NWE\n"; diff --git a/agc_2-X/trunk/www/vicidial/help.php b/agc_2-X/trunk/www/vicidial/help.php index c8923f3d..ef7c94ce 100644 --- a/agc_2-X/trunk/www/vicidial/help.php +++ b/agc_2-X/trunk/www/vicidial/help.php @@ -829,6 +829,10 @@ if ($SSqc_features_active > 0)
- +
+ +
+ - @@ -1418,6 +1422,21 @@ if ($SSoutbound_autodial_active > 0)
- +
+ +
+ - + +
+ +
+ - + +
+ +
+ - +