diff --git a/agc_2-X/trunk/www/vicidial/dbconnect_mysqli.php b/agc_2-X/trunk/www/vicidial/dbconnect_mysqli.php index c7028479..c7d346b0 100644 --- a/agc_2-X/trunk/www/vicidial/dbconnect_mysqli.php +++ b/agc_2-X/trunk/www/vicidial/dbconnect_mysqli.php @@ -1,16 +1,17 @@ LICENSE: AGPLv2 +# Copyright (C) 2015 Matt Florell LICENSE: AGPLv2 # # CHANGES: # 130328-0022 - Converted ereg to preg functions # 130802-0957 - Changed to PHP mysqli functions, added # 131101-0713 - Fixed slave server setting # 131210-1746 - Added ability to define slave server with port number, issue #687 +# 150216-1529 - Removed non-latin set to 0 # if ( file_exists("/etc/astguiclient.conf") ) @@ -83,7 +84,7 @@ $local_AMP = '@'; $ext_context = 'default'; $recording_exten = '8309'; $WeBRooTWritablE = '1'; -$non_latin = '0'; # set to 1 for UTF rules, overridden by system_settings +# $non_latin = '0'; # set to 1 for UTF rules, overridden by system_settings $flag_channels=0; $flag_string = 'VICIast20'; diff --git a/agc_2-X/trunk/www/vicidial/functions.php b/agc_2-X/trunk/www/vicidial/functions.php index 355f17c7..8f14493c 100644 --- a/agc_2-X/trunk/www/vicidial/functions.php +++ b/agc_2-X/trunk/www/vicidial/functions.php @@ -22,11 +22,13 @@ # 141118-0109 - Added options for up to 9 ordered variables within QXZ function output # 141229-1535 - Added code to QXZ allowing for on-the-fly mysql phrase lookups # 150210-1358 - Added precision S default to 0 in sec_convert +# 150216-1528 - Fixed non-latin problem, issue #828 # ##### BEGIN validate user login credentials, check for failed lock out ##### function user_authorization($user,$pass,$user_option,$user_update) { + global $link; require("dbconnect_mysqli.php"); ############################################# @@ -410,22 +412,32 @@ function download_max_system_stats($campaign_id,$days_graph,$title,$metric,$metr $CSV_text.="\n\n"; } } -##### BEGIN download max stats data ##### +##### END download max stats data ##### -function mysql_to_mysqli($stmt, $link) { + +function mysql_to_mysqli($stmt, $link) + { $rslt=mysqli_query($link, $stmt); return $rslt; -} - -function MathZDC($dividend, $divisor, $quotient=0) { - if ($divisor==0) { - return $quotient; - } else if ($dividend==0) { - return 0; - } else { - return ($dividend/$divisor); } -} + + +function MathZDC($dividend, $divisor, $quotient=0) + { + if ($divisor==0) + { + return $quotient; + } + else if ($dividend==0) + { + return 0; + } + else + { + return ($dividend/$divisor); + } + } + # function to print/echo content, options for length, alignment and ordered internal variables are included function _QXZ($English_text, $sprintf=0, $align="l", $v_one='', $v_two='', $v_three='', $v_four='', $v_five='', $v_six='', $v_seven='', $v_eight='', $v_nine='')