ViciDial/ViciDialSVN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed admin non-latin problem, issue #828

Browse Source 
git-svn-id: svn://192.168.202.10@2277 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2015-02-16 20:45:07 +00:00
parent 92dc4f1bbc
commit 9cac881ebb
2 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agc_2-X/trunk/www/vicidial/dbconnect_mysqli.php
+4 -3
View File
@@ -1,16 +1,17 @@
<?php <?php
# #
# dbconnect_mysqli.php version 2.8 # dbconnect_mysqli.php version 2.10
# #
# database connection settings and some global web settings # database connection settings and some global web settings
# #
# Copyright (C) 2013 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2 # Copyright (C) 2015 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# #
# CHANGES: # CHANGES:
# 130328-0022 - Converted ereg to preg functions # 130328-0022 - Converted ereg to preg functions
# 130802-0957 - Changed to PHP mysqli functions, added # 130802-0957 - Changed to PHP mysqli functions, added
# 131101-0713 - Fixed slave server setting # 131101-0713 - Fixed slave server setting
# 131210-1746 - Added ability to define slave server with port number, issue #687 # 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") ) if ( file_exists("/etc/astguiclient.conf") )
@@ -83,7 +84,7 @@ $local_AMP = '@';
$ext_context = 'default'; $ext_context = 'default';
$recording_exten = '8309'; $recording_exten = '8309';
$WeBRooTWritablE = '1'; $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_channels=0;
$flag_string = 'VICIast20'; $flag_string = 'VICIast20';
agc_2-X/trunk/www/vicidial/functions.php
+24 -12
View File
@@ -22,11 +22,13 @@
# 141118-0109 - Added options for up to 9 ordered variables within QXZ function output # 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 # 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 # 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 ##### ##### BEGIN validate user login credentials, check for failed lock out #####
function user_authorization($user,$pass,$user_option,$user_update) function user_authorization($user,$pass,$user_option,$user_update)
{ {
global $link;
require("dbconnect_mysqli.php"); require("dbconnect_mysqli.php");
############################################# #############################################
@@ -410,22 +412,32 @@ function download_max_system_stats($campaign_id,$days_graph,$title,$metric,$metr
$CSV_text.="\n\n"; $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); $rslt=mysqli_query($link, $stmt);
return $rslt; 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 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='') 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='')