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

Fix for new custom fields changes on older PHP versions

Browse Source 
git-svn-id: svn://192.168.202.10@3353 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2021-02-12 00:20:44 +00:00
parent 05452d2883
commit 19f32dd28e
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agc_2-X/trunk/www/agc/functions.php
+23 -16
View File
@@ -50,7 +50,8 @@
# 191013-1029 - Fixes for PHP7
# 200406-1204 - Fix for gender default field population
# 210211-0145 - Added SOURCESELECT field type, added basic Math equations to SCRIPT custom field types
#
# 210211-1916 - Disable SCRIPT custom fields Math functions on older PHP versions
#
# $mysql_queries = 26
@@ -344,7 +345,10 @@ function custom_list_fields_values($lead_id,$list_id,$uniqueid,$user,$DB,$call_i
$custom_required_fields_multi='|';
require("dbconnect_mysqli.php");
require("Evaluator.php");
$php_version = phpversion();
if (!preg_match("/^4|^5|^6/",$php_version))
{require("Evaluator.php");}
$CFoutput='';
$stmt="SHOW TABLES LIKE \"custom_$list_id\";";
@@ -1378,23 +1382,26 @@ function custom_list_fields_values($lead_id,$list_id,$uniqueid,$user,$DB,$call_i
# check for Math formulas
if ( (preg_match("/--M--/",$CFoutput)) or (preg_match("/--N--/",$CFoutput)) )
{
$DBM=0;
$evaluator = new \Matex\Evaluator();
preg_match_all("/--M--(.*?)--N--/", $CFoutput, $MathMatch);
$MathMatch_count = count($MathMatch[0]);
$Mct=0;
while ($MathMatch_count > $Mct)
if (!preg_match("/^4|^5|^6/",$php_version))
{
$temp_MathEq = $MathMatch[0][$Mct];
$temp_MathEq = preg_replace("/--M--|--N--/",'',$temp_MathEq);
$temp_MathEq_orig = $temp_MathEq;
$temp_MathEq = preg_replace("/[^- \+\-\*\^\.\(\)\%\/0-9]/",'',$temp_MathEq);
$DBM=0;
$evaluator = new \Matex\Evaluator();
preg_match_all("/--M--(.*?)--N--/", $CFoutput, $MathMatch);
$MathMatch_count = count($MathMatch[0]);
$Mct=0;
while ($MathMatch_count > $Mct)
{
$temp_MathEq = $MathMatch[0][$Mct];
$temp_MathEq = preg_replace("/--M--|--N--/",'',$temp_MathEq);
$temp_MathEq_orig = $temp_MathEq;
$temp_MathEq = preg_replace("/[^- \+\-\*\^\.\(\)\%\/0-9]/",'',$temp_MathEq);
$temp_MathResult = $evaluator->execute($temp_MathEq);
if ($DBM > 0) {$CFoutput .= "MATH DEBUG: $Mct|$temp_MathEq|$temp_MathResult|\n";}
$CFoutput = str_replace("--M--$temp_MathEq_orig--N--","$temp_MathResult",$CFoutput);
$temp_MathResult = $evaluator->execute($temp_MathEq);
if ($DBM > 0) {$CFoutput .= "MATH DEBUG: $Mct|$temp_MathEq|$temp_MathResult|\n";}
$CFoutput = str_replace("--M--$temp_MathEq_orig--N--","$temp_MathResult",$CFoutput);
$Mct++;
$Mct++;
}
}
}
agc_2-X/trunk/www/vicidial/admin_lists_custom.php
+2 -2
View File
@@ -180,9 +180,9 @@ if ($non_latin < 1)
$field_name = preg_replace('/[^ \.\,-\_0-9a-zA-Z]/','',$field_name);
$field_description = preg_replace('/[^ \.\,-\_0-9a-zA-Z]/','',$field_description);
$field_options = preg_replace('/[^ \'\&\.\n\,-\_0-9a-zA-Z]/', '',$field_options);
$field_options = preg_replace('/[^ \'\&\.\n\|\,-\_0-9a-zA-Z]/', '',$field_options);
if ($field_type != 'SCRIPT')
{$field_options = preg_replace('/[^ \.\n\,-\_0-9a-zA-Z]/', '',$field_options);}
{$field_options = preg_replace('/[^ \.\n\|\,-\_0-9a-zA-Z]/', '',$field_options);}
$field_default = preg_replace('/[^ \.\n\,-\_0-9a-zA-Z]/', '',$field_default);
} # end of non_latin
else