diff --git a/agi/agi-VDAD_ALL_outbound.agi b/agi/agi-VDAD_ALL_outbound.agi index d3988682..09a0cf16 100644 --- a/agi/agi-VDAD_ALL_outbound.agi +++ b/agi/agi-VDAD_ALL_outbound.agi @@ -109,6 +109,7 @@ # 140126-1128 - Added VMAIL_NO_INST options # 140215-2121 - Added several variable options for QM socket URL # 140312-2112 - Added CALLID as recording filename variable +# 140617-1946 - Added single-digit change to text for TTS # $script = 'agi-VDAD_ALL_outbound.agi'; @@ -792,37 +793,37 @@ if ($VDACaffected_rows > 0) if ($sthArows > 0) { @aryA = $sthA->fetchrow_array; - $TTS_lead_id = $aryA[0]; - $TTS_entry_date = $aryA[1]; - $TTS_modify_date = $aryA[2]; - $TTS_status = $aryA[3]; - $TTS_user = $aryA[4]; - $TTS_vendor_lead_code = $aryA[5]; - $TTS_source_id = $aryA[6]; - $TTS_list_id = $aryA[7]; - $TTS_phone_number = $aryA[8]; - $TTS_title = $aryA[9]; - $TTS_first_name = $aryA[10]; - $TTS_middle_initial = $aryA[11]; - $TTS_last_name = $aryA[12]; - $TTS_address1 = $aryA[13]; - $TTS_address2 = $aryA[14]; - $TTS_address3 = $aryA[15]; - $TTS_city = $aryA[16]; - $TTS_state = $aryA[17]; - $TTS_province = $aryA[18]; - $TTS_postal_code = $aryA[19]; - $TTS_country_code = $aryA[20]; - $TTS_gender = $aryA[21]; - $TTS_date_of_birth = $aryA[22]; - $TTS_alt_phone = $aryA[23]; - $TTS_email = $aryA[24]; - $TTS_security_phrase = $aryA[25]; - $TTS_comments = $aryA[26]; - $TTS_called_count = $aryA[27]; - $TTS_last_local_call_time = $aryA[28]; - $TTS_rank = $aryA[29]; - $TTS_owner = $aryA[30]; + $TTS_lead_id = tts_num_var_test($aryA[0]); + $TTS_entry_date = tts_num_var_test($aryA[1]); + $TTS_modify_date = tts_num_var_test($aryA[2]); + $TTS_status = tts_num_var_test($aryA[3]); + $TTS_user = tts_num_var_test($aryA[4]); + $TTS_vendor_lead_code = tts_num_var_test($aryA[5]); + $TTS_source_id = tts_num_var_test($aryA[6]); + $TTS_list_id = tts_num_var_test($aryA[7]); + $TTS_phone_number = tts_num_var_test($aryA[8]); + $TTS_title = tts_num_var_test($aryA[9]); + $TTS_first_name = tts_num_var_test($aryA[10]); + $TTS_middle_initial = tts_num_var_test($aryA[11]); + $TTS_last_name = tts_num_var_test($aryA[12]); + $TTS_address1 = tts_num_var_test($aryA[13]); + $TTS_address2 = tts_num_var_test($aryA[14]); + $TTS_address3 = tts_num_var_test($aryA[15]); + $TTS_city = tts_num_var_test($aryA[16]); + $TTS_state = tts_num_var_test($aryA[17]); + $TTS_province = tts_num_var_test($aryA[18]); + $TTS_postal_code = tts_num_var_test($aryA[19]); + $TTS_country_code = tts_num_var_test($aryA[20]); + $TTS_gender = tts_num_var_test($aryA[21]); + $TTS_date_of_birth = tts_num_var_test($aryA[22]); + $TTS_alt_phone = tts_num_var_test($aryA[23]); + $TTS_email = tts_num_var_test($aryA[24]); + $TTS_security_phrase = tts_num_var_test($aryA[25]); + $TTS_comments = tts_num_var_test($aryA[26]); + $TTS_called_count = tts_num_var_test($aryA[27]); + $TTS_last_local_call_time = tts_num_var_test($aryA[28]); + $TTS_rank = tts_num_var_test($aryA[29]); + $TTS_owner = tts_num_var_test($aryA[30]); } $sthA->finish(); @@ -941,6 +942,11 @@ if ($VDACaffected_rows > 0) # $voice = 'Allison-8kHz'; # override the voice to Allison-8k print STDERR "\nGenerating: $TTS_text[$s] - $TTS_voice\n"; + open(CEPout, ">>$CEPLOGfile") + || die "Can't open $CEPLOGfile: $!\n"; + print CEPout "$PATHagi/cepstral_generate.pl --debug --voice=$TTS_voice --dialog=$TTS_text[$s]\n"; + close(CEPout); + ### send command to generate cepstral TTS audio file `$PATHagi/cepstral_generate.pl --debug --voice=$TTS_voice --dialog=$TTS_text[$s] >> $CEPLOGfile $hideCLI`; @@ -3846,6 +3852,28 @@ sub parse_asterisk_version } +##### TTS test variables for single digits, convert to text if true ##### +sub tts_num_var_test + { + $_ = $_[0]; + $var_test = $_; + if ( (length($var_test) > 0) && (length($var_test) < 2) ) + { + $var_test =~ s/0/zero /gi; + $var_test =~ s/1/one /gi; + $var_test =~ s/2/two /gi; + $var_test =~ s/3/three /gi; + $var_test =~ s/4/four /gi; + $var_test =~ s/5/five /gi; + $var_test =~ s/6/six /gi; + $var_test =~ s/7/seven /gi; + $var_test =~ s/8/eight /gi; + $var_test =~ s/9/nine /gi; + } + return $var_test; + } + + sub trigger_transfer_process { # $DS='--'; diff --git a/www/agc/api.php b/www/agc/api.php index 3b7d1225..a43d77b9 100644 --- a/www/agc/api.php +++ b/www/agc/api.php @@ -352,7 +352,7 @@ else $stmt="SELECT count(*) from vicidial_users where user='$user' and vdc_agent_api_access='1';"; if ($DB) {echo "|$stmt|\n";} - if ($non_latin > 0) {$rslt=mysql_to_mysqli($link, "SET NAMES 'UTF8'");} + if ($non_latin > 0) {$rslt=mysql_to_mysqli("SET NAMES 'UTF8'", $link);} $rslt=mysql_to_mysqli($stmt, $link); $row=mysqli_fetch_row($rslt); $auth_api=$row[0]; diff --git a/www/agc/functions.php b/www/agc/functions.php index 3c1a1e02..1969cc0a 100644 --- a/www/agc/functions.php +++ b/www/agc/functions.php @@ -78,7 +78,7 @@ function user_authorization($user,$pass,$user_option,$user_update,$bcrypt,$retur if ($user_option == 'MGR') {$stmt="SELECT count(*) from vicidial_users where user='$user' and $passSQL and manager_shift_enforcement_override='1' and active='Y' and ( (failed_login_count < $LOCK_trigger_attempts) or (UNIX_TIMESTAMP(last_login_date) < $LOCK_over) );";} if ($DB) {echo "|$stmt|\n";} - if ($non_latin > 0) {$rslt=mysql_to_mysqli($link, "SET NAMES 'UTF8'");} + if ($non_latin > 0) {$rslt=mysql_to_mysqli("SET NAMES 'UTF8'", $link);} $rslt=mysql_to_mysqli($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'05009',$user,$server_ip,$session_name,$one_mysql_log);} $row=mysqli_fetch_row($rslt); @@ -88,7 +88,7 @@ function user_authorization($user,$pass,$user_option,$user_update,$bcrypt,$retur { $auth_key='BAD'."|$stmt"; $stmt="SELECT failed_login_count,UNIX_TIMESTAMP(last_login_date) from vicidial_users where user='$user';"; - if ($non_latin > 0) {$rslt=mysql_to_mysqli($link, "SET NAMES 'UTF8'");} + if ($non_latin > 0) {$rslt=mysql_to_mysqli("SET NAMES 'UTF8'", $link);} $rslt=mysql_to_mysqli($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'05010',$user,$server_ip,$session_name,$one_mysql_log);} $cl_user_ct = mysqli_num_rows($rslt); diff --git a/www/agc/phone_only.php b/www/agc/phone_only.php index d29305d3..2be64b8e 100644 --- a/www/agc/phone_only.php +++ b/www/agc/phone_only.php @@ -176,7 +176,7 @@ echo "