diff --git a/agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl b/agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl index 34e44143..1a489fb8 100644 --- a/agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl +++ b/agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl @@ -416,7 +416,8 @@ if ( sleep(1); - `PERL5LIB="$PATHhome/libs"; export PERL5LIB`; + #`PERL5LIB="$PATHhome/libs"; export PERL5LIB`; # issue #457 + $ENV{'PERL5LIB'} = "$PATHhome/libs"; ### you may have to use a different ps command if you're not using Slackware Linux # @psoutput = `ps -f -C AST_update --no-headers`; # @psoutput = `ps -f -C AST_updat* --no-headers`; diff --git a/agc_2-X/trunk/bin/AST_manager_kill_hung_congested.pl b/agc_2-X/trunk/bin/AST_manager_kill_hung_congested.pl index 62807549..5013d49c 100644 --- a/agc_2-X/trunk/bin/AST_manager_kill_hung_congested.pl +++ b/agc_2-X/trunk/bin/AST_manager_kill_hung_congested.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# AST_manager_kill_hung_congested.pl version 2.0.5 +# AST_manager_kill_hung_congested.pl version 2.2.4 # # Part of the Asterisk Central Queue System (ACQS) # @@ -11,13 +11,14 @@ # # put this in the cron to run every minute # -# Copyright (C) 2008 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2011 Matt Florell LICENSE: AGPLv2 # # CHANGES # 50823-1525 - Added commandline debug options with debug printouts # 60717-1247 - changed to DBI by Marin Blu # 60717-1536 - changed to use /etc/astguiclient.conf for configs # 60814-1706 - added option for no logging to file +# 110318-1940 - fixed issue #441 # # constants @@ -132,6 +133,9 @@ $dbhA = DBI->connect("DBI:mysql:$VARDB_database:$VARDB_server:$VARDB_port", "$VA } $sthA->finish(); +$event_string = "SUBRT|killing_congest|KC|START|"; +&event_logger; + $stmtA = "SELECT channel FROM live_sip_channels where server_ip = '$server_ip' and extension = 'CONGEST' and channel LIKE \"Local%\" limit 99"; $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; @@ -164,7 +168,7 @@ foreach(@congest_kill) $stmtA = "INSERT INTO vicidial_manager values('','','$now_date','NEW','N','$server_ip','','Hangup','$KCqueryCID','Channel: $congest_kill[$i]','','','','','','','','','')"; $event_string = "SUBRT|killing_congest|KC|$KCqueryCID|$congest_kill[$i]|$stmtA|"; - event_logger; + &event_logger; if ($DB) {print "KILLING $congest_kill[$i]\n";} $affected_rows = $dbhA->do($stmtA); @@ -213,7 +217,7 @@ foreach(@congest_kill) $stmtA = "INSERT INTO vicidial_manager values('','','$now_date','NEW','N','$server_ip','','Hangup','$KCqueryCID','Channel: $congest_kill[$i]','','','','','','','','','')"; $event_string = "SUBRT|killing_congest|KC|$KCqueryCID|$congest_kill[$i]|$stmtA|"; - event_logger; + &event_logger; if ($DB) {print "KILLING $congest_kill[$i]\n";} $affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:\n"; @@ -263,7 +267,7 @@ foreach(@congest_kill) $stmtA = "INSERT INTO vicidial_manager values('','','$now_date','NEW','N','$server_ip','','Hangup','$KCqueryCID','Channel: $congest_kill[$i]','','','','','','','','','')"; $event_string = "SUBRT|killing_congest|KC|$KCqueryCID|$congest_kill[$i]|$stmtA|"; - event_logger; + &event_logger; if ($DB) {print "KILLING $congest_kill[$i]\n";} $affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:\n"; @@ -315,7 +319,7 @@ foreach(@congest_kill) $stmtA = "INSERT INTO vicidial_manager values('','','$now_date','NEW','N','$server_ip','','Hangup','$KCqueryCID','Channel: $congest_kill[$i]','','','','','','','','','')"; $event_string = "SUBRT|killing_congest|KC|$KCqueryCID|$congest_kill[$i]|$stmtA|"; - event_logger; + &event_logger; if ($DB) {print "KILLING $congest_kill[$i]\n";} $affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:\n"; diff --git a/agc_2-X/trunk/www/agc/vicidial.php b/agc_2-X/trunk/www/agc/vicidial.php index eff559da..582e109e 100644 --- a/agc_2-X/trunk/www/agc/vicidial.php +++ b/agc_2-X/trunk/www/agc/vicidial.php @@ -342,10 +342,11 @@ # 110304-1623 - Added callback count notification defer options # 110310-0331 - Added auto-pause/resume functions in auto-dial mode for pre-call work # 110310-1627 - Changed most browser alerts to HTML alerts, other bug fixes +# 110322-0923 - Allowed hiding of gender pulldown # -$version = '2.4-319c'; -$build = '110310-1627'; +$version = '2.4-320c'; +$build = '110322-0923'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=72; $one_mysql_log=0; @@ -556,6 +557,10 @@ if (strlen($row[17])>0) {$label_email = $row[17];} if (strlen($row[18])>0) {$label_comments = $row[18];} ### END find any custom field labels ### +$hide_gender=0; +if ($label_gender == '---HIDE---') + {$hide_gender=1;} + $US='_'; $CL=':'; $AT='@'; @@ -3307,6 +3312,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var auto_pause_precall_code=''; var auto_resume_precall=''; var trigger_ready=0; + var hide_gender=''; var DiaLControl_auto_HTML = "\"\"Resume\""; var DiaLControl_auto_HTML_ready = "\"\"Resume\""; var DiaLControl_auto_HTML_OFF = "\"\"Resume\""; @@ -5916,13 +5922,20 @@ function set_length(SLnumber,SLlength_goal,SLdirection) if (fields_list.match(regUDgender)) { document.vicidial_form.gender.value = UDfieldsResponse_array[18]; - var gIndex = 0; - if (document.vicidial_form.gender.value == 'M') {var gIndex = 1;} - if (document.vicidial_form.gender.value == 'F') {var gIndex = 2;} - document.getElementById("gender_list").selectedIndex = gIndex; - var genderIndex = document.getElementById("gender_list").selectedIndex; - var genderValue = document.getElementById('gender_list').options[genderIndex].value; - document.vicidial_form.gender.value = genderValue; + if (hide_gender > 0) + { + document.vicidial_form.gender_list.value = UDfieldsResponse_array[18]; + } + else + { + var gIndex = 0; + if (document.vicidial_form.gender.value == 'M') {var gIndex = 1;} + if (document.vicidial_form.gender.value == 'F') {var gIndex = 2;} + document.getElementById("gender_list").selectedIndex = gIndex; + var genderIndex = document.getElementById("gender_list").selectedIndex; + var genderValue = document.getElementById('gender_list').options[genderIndex].value; + document.vicidial_form.gender.value = genderValue; + } } var regUDdate_of_birth = new RegExp("date_of_birth,","ig"); if (fields_list.match(regUDdate_of_birth)) @@ -6208,14 +6221,21 @@ function set_length(SLnumber,SLlength_goal,SLdirection) document.getElementById("MainStatuSSpan").innerHTML = " Calling: " + status_display_number + " UID: " + MDnextCID + "   " + man_status; if ( (dialed_label.length < 2) || (dialed_label=='NONE') ) {dialed_label='MAIN';} - var gIndex = 0; - if (document.vicidial_form.gender.value == 'M') {var gIndex = 1;} - if (document.vicidial_form.gender.value == 'F') {var gIndex = 2;} - document.getElementById("gender_list").selectedIndex = gIndex; + if (hide_gender > 0) + { + document.vicidial_form.gender_list.value = MDnextResponse_array[21]; + } + else + { + var gIndex = 0; + if (document.vicidial_form.gender.value == 'M') {var gIndex = 1;} + if (document.vicidial_form.gender.value == 'F') {var gIndex = 2;} + document.getElementById("gender_list").selectedIndex = gIndex; + var genderIndex = document.getElementById("gender_list").selectedIndex; + var genderValue = document.getElementById('gender_list').options[genderIndex].value; + document.vicidial_form.gender.value = genderValue; + } - var genderIndex = document.getElementById("gender_list").selectedIndex; - var genderValue = document.getElementById('gender_list').options[genderIndex].value; - document.vicidial_form.gender.value = genderValue; LeaDDispO=''; VDIC_web_form_address = VICIDiaL_web_form_address @@ -7126,10 +7146,18 @@ function set_length(SLnumber,SLlength_goal,SLdirection) custom_field_values = check_VDIC_array[49]; custom_field_types = check_VDIC_array[50]; - var gIndex = 0; - if (document.vicidial_form.gender.value == 'M') {var gIndex = 1;} - if (document.vicidial_form.gender.value == 'F') {var gIndex = 2;} - document.getElementById("gender_list").selectedIndex = gIndex; + + if (hide_gender > 0) + { + document.vicidial_form.gender_list.value = check_VDIC_array[25]; + } + else + { + var gIndex = 0; + if (document.vicidial_form.gender.value == 'M') {var gIndex = 1;} + if (document.vicidial_form.gender.value == 'F') {var gIndex = 2;} + document.getElementById("gender_list").selectedIndex = gIndex; + } lead_dial_number = document.vicidial_form.phone_number.value; var dispnum = document.vicidial_form.phone_number.value; @@ -7289,9 +7317,13 @@ function set_length(SLnumber,SLlength_goal,SLdirection) {var group = campaign;} if ( (dialed_label.length < 2) || (dialed_label=='NONE') ) {dialed_label='MAIN';} - var genderIndex = document.getElementById("gender_list").selectedIndex; - var genderValue = document.getElementById('gender_list').options[genderIndex].value; - document.vicidial_form.gender.value = genderValue; + if (hide_gender < 1) + { + var genderIndex = document.getElementById("gender_list").selectedIndex; + var genderValue = document.getElementById('gender_list').options[genderIndex].value; + document.vicidial_form.gender.value = genderValue; + } + LeaDDispO=''; var regWFAcustom = new RegExp("^VAR","ig"); @@ -7433,9 +7465,12 @@ function set_length(SLnumber,SLlength_goal,SLdirection) if (submittask != 'YES') { - var genderIndex = document.getElementById("gender_list").selectedIndex; - var genderValue = document.getElementById('gender_list').options[genderIndex].value; - document.vicidial_form.gender.value = genderValue; + if (hide_gender < 1) + { + var genderIndex = document.getElementById("gender_list").selectedIndex; + var genderValue = document.getElementById('gender_list').options[genderIndex].value; + document.vicidial_form.gender.value = genderValue; + } } var regWFAcustom = new RegExp("^VAR","ig"); @@ -7475,9 +7510,12 @@ function set_length(SLnumber,SLlength_goal,SLdirection) if (submittask != 'YES') { - var genderIndex = document.getElementById("gender_list").selectedIndex; - var genderValue = document.getElementById('gender_list').options[genderIndex].value; - document.vicidial_form.gender.value = genderValue; + if (hide_gender < 1) + { + var genderIndex = document.getElementById("gender_list").selectedIndex; + var genderValue = document.getElementById('gender_list').options[genderIndex].value; + document.vicidial_form.gender.value = genderValue; + } } var regWFAcustom = new RegExp("^VAR","ig"); @@ -7973,10 +8011,12 @@ function set_length(SLnumber,SLlength_goal,SLdirection) } if (xmlhttp) { - - var genderIndex = document.getElementById("gender_list").selectedIndex; - var genderValue = document.getElementById('gender_list').options[genderIndex].value; - document.vicidial_form.gender.value = genderValue; + if (hide_gender < 1) + { + var genderIndex = document.getElementById("gender_list").selectedIndex; + var genderValue = document.getElementById('gender_list').options[genderIndex].value; + document.vicidial_form.gender.value = genderValue; + } VLupdate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&campaign=" + campaign + "&ACTION=updateLEAD&format=text&user=" + user + "&pass=" + pass + "&lead_id=" + document.vicidial_form.lead_id.value + @@ -8499,8 +8539,11 @@ function set_length(SLnumber,SLlength_goal,SLdirection) { manual_dial_finished(); } - document.getElementById("GENDERhideFORieALT").innerHTML = ''; - document.getElementById("GENDERhideFORie").innerHTML = ''; + if (hide_gender < 1) + { + document.getElementById("GENDERhideFORieALT").innerHTML = ''; + document.getElementById("GENDERhideFORie").innerHTML = ''; + } hideDiv('DispoSelectBox'); hideDiv('DispoButtonHideA'); hideDiv('DispoButtonHideB'); @@ -11201,8 +11244,11 @@ function phone_number_format(formatphone) { wrapup_waiting=1; } CustomerData_update(); - document.getElementById("GENDERhideFORie").innerHTML = ''; - document.getElementById("GENDERhideFORieALT").innerHTML = ''; + if (hide_gender < 1) + { + document.getElementById("GENDERhideFORie").innerHTML = ''; + document.getElementById("GENDERhideFORieALT").innerHTML = ''; + } showDiv('DispoSelectBox'); DispoSelectContent_create('','ReSET'); WaitingForNextStep=1; @@ -11914,26 +11960,32 @@ function phone_number_format(formatphone) { function HidEGenDerPulldown() { - var gIndex = 0; - var genderIndex = document.getElementById("gender_list").selectedIndex; - var genderValue = document.getElementById('gender_list').options[genderIndex].value; - if (genderValue == 'M') {var gIndex = 1;} - if (genderValue == 'F') {var gIndex = 2;} - document.getElementById("GENDERhideFORieALT").innerHTML = ''; - document.getElementById("GENDERhideFORie").innerHTML = ''; - document.getElementById("gender_list").selectedIndex = gIndex; + if (hide_gender < 1) + { + var gIndex = 0; + var genderIndex = document.getElementById("gender_list").selectedIndex; + var genderValue = document.getElementById('gender_list').options[genderIndex].value; + if (genderValue == 'M') {var gIndex = 1;} + if (genderValue == 'F') {var gIndex = 2;} + document.getElementById("GENDERhideFORieALT").innerHTML = ''; + document.getElementById("GENDERhideFORie").innerHTML = ''; + document.getElementById("gender_list").selectedIndex = gIndex; + } } function ShoWGenDerPulldown() { - var gIndex = 0; - var genderIndex = document.getElementById("gender_list").selectedIndex; - var genderValue = document.getElementById('gender_list').options[genderIndex].value; - if (genderValue == 'M') {var gIndex = 1;} - if (genderValue == 'F') {var gIndex = 2;} - document.getElementById("GENDERhideFORie").innerHTML = ''; - document.getElementById("GENDERhideFORieALT").innerHTML = ''; - document.getElementById("gender_list").selectedIndex = gIndex; + if (hide_gender < 1) + { + var gIndex = 0; + var genderIndex = document.getElementById("gender_list").selectedIndex; + var genderValue = document.getElementById('gender_list').options[genderIndex].value; + if (genderValue == 'M') {var gIndex = 1;} + if (genderValue == 'F') {var gIndex = 2;} + document.getElementById("GENDERhideFORie").innerHTML = ''; + document.getElementById("GENDERhideFORieALT").innerHTML = ''; + document.getElementById("gender_list").selectedIndex = gIndex; + } } @@ -12189,7 +12241,14 @@ $zi=2; echo ""; - echo "$label_gender: "; + if ($label_gender == '---HIDE---') + { + echo ""; + } + else + { + echo "$label_gender: "; + } echo ""; diff --git a/agc_2-X/trunk/www/vicidial/user_stats.php b/agc_2-X/trunk/www/vicidial/user_stats.php index 7323837c..f660e76b 100644 --- a/agc_2-X/trunk/www/vicidial/user_stats.php +++ b/agc_2-X/trunk/www/vicidial/user_stats.php @@ -382,7 +382,7 @@ if ($did < 1) echo "\n"; echo "\n"; - $stmt="SELECT event,event_epoch,event_date,campaign_id,user_group,session_id,server_ip,extension,computer_ip from vicidial_user_log where user='" . mysql_real_escape_string($user) . "' and event_date >= '" . mysql_real_escape_string($begin_date) . " 0:00:01' and event_date <= '" . mysql_real_escape_string($end_date) . " 23:59:59'"; + $stmt="SELECT event,event_epoch,event_date,campaign_id,user_group,session_id,server_ip,extension,computer_ip from vicidial_user_log where user='" . mysql_real_escape_string($user) . "' and event_date >= '" . mysql_real_escape_string($begin_date) . " 0:00:01' and event_date <= '" . mysql_real_escape_string($end_date) . " 23:59:59' order by event_date;"; $rslt=mysql_query($stmt, $link); $events_to_print = mysql_num_rows($rslt);
EVENT DATE CAMPAIGN GROUPHOURS:MM:SSSESSIONSERVERPHONECOMPUTER