From eda4bebb9a2b3f7454246a9d9e91bb5d6a42b611 Mon Sep 17 00:00:00 2001 From: mattf Date: Wed, 5 Mar 2014 13:57:59 +0000 Subject: [PATCH] Fixed admin logging bug for lists enabled special characters fixes for modify lead and audit comments git-svn-id: svn://192.168.202.10@2081 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/www/agc/audit_comments.php | 5 ++- agc_2-X/trunk/www/vicidial/admin.php | 11 ++--- .../trunk/www/vicidial/admin_modify_lead.php | 41 ++++++++++--------- 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/agc_2-X/trunk/www/agc/audit_comments.php b/agc_2-X/trunk/www/agc/audit_comments.php index ff41cc6b..e5aa4ab0 100644 --- a/agc_2-X/trunk/www/agc/audit_comments.php +++ b/agc_2-X/trunk/www/agc/audit_comments.php @@ -1,13 +1,14 @@ 0) { $comment=$row[0]; //Put comment in comment table - $stmt="INSERT INTO vicidial_comments (lead_id,user_id,list_id,campaign_id,comment) VALUES ('$lead_id','$user','$list_id','$campaign','$comment');"; + $stmt="INSERT INTO vicidial_comments (lead_id,user_id,list_id,campaign_id,comment) VALUES ('$lead_id','$user','$list_id','$campaign','".mysqli_real_escape_string($link, $comment)."');"; if ($format=='debug') { echo "\n"; } diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index e8c80a5b..48650b3f 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -3275,12 +3275,13 @@ else # 140206-1357 - Filter dashes from new or copied campaigns and in-groups # 140214-1643 - Added system settings dialplan reload timestamp # 140302-0958 - Added Webserver-URL Report +# 140305-0846 - Bug fix for list modify admin logging issue # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time -$admin_version = '2.8-427a'; -$build = '140302-0958'; +$admin_version = '2.8-428a'; +$build = '140305-0846'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -12567,13 +12568,13 @@ if ($ADD==411) $rslt=mysql_to_mysqli($stmt, $link); ## BEGIN QC Addition for Audited Comments - $stmt="INSERT INTO vicidial_lists_custom (audit_comments, list_id) VALUES ('" . mysqli_real_escape_string($link, $audit_comments) . "','$list_id') ON DUPLICATE KEY UPDATE audit_comments='" . mysqli_real_escape_string($link, $audit_comments) . "';"; - $rslt=mysql_to_mysqli($stmt, $link); + $stmtQC="INSERT INTO vicidial_lists_custom (audit_comments, list_id) VALUES ('" . mysqli_real_escape_string($link, $audit_comments) . "','$list_id') ON DUPLICATE KEY UPDATE audit_comments='" . mysqli_real_escape_string($link, $audit_comments) . "';"; + $rslt=mysql_to_mysqli($stmtQC, $link); if ($DB) {echo "|$stmt|\n";} ## END QC Addition for Audited Comments ### LOG INSERTION Admin Log Table ### - $SQL_log = "$stmt|"; + $SQL_log = "$stmt|$stmtQC|"; $SQL_log = preg_replace('/;/', '', $SQL_log); $SQL_log = addslashes($SQL_log); $stmt="INSERT INTO vicidial_admin_log set event_date='$SQLdate', user='$PHP_AUTH_USER', ip_address='$ip', event_section='LISTS', event_type='MODIFY', record_id='$list_id', event_code='ADMIN MODIFY LIST', event_sql=\"$SQL_log\", event_notes='';"; diff --git a/agc_2-X/trunk/www/vicidial/admin_modify_lead.php b/agc_2-X/trunk/www/vicidial/admin_modify_lead.php index 3f83c0f4..200c0b55 100644 --- a/agc_2-X/trunk/www/vicidial/admin_modify_lead.php +++ b/agc_2-X/trunk/www/vicidial/admin_modify_lead.php @@ -58,6 +58,7 @@ # 130901-0816 - Changed to mysqli PHP functions # 130926-2053 - Added option for viewing/modifying vicidial_list_archive leads # 140125-1100 - Fixed issue with Callback records having no campaign_id +# 140304-2034 - Fixed issue with special characters in standard data fields # require("dbconnect_mysqli.php"); @@ -928,27 +929,27 @@ else else { echo "$label_title:   \n"; - echo "$label_first_name: \n"; - echo "$label_middle_initial:   \n"; - echo " $label_last_name: \n"; - echo "$label_address1 : \n"; - echo "$label_address2 : \n"; - echo "$label_address3 : \n"; - echo "$label_city : \n"; - echo "$label_state:   \n"; - echo " $label_postal_code: \n"; + echo "$label_first_name: \n"; + echo "$label_middle_initial:   \n"; + echo " $label_last_name: \n"; + echo "$label_address1 : \n"; + echo "$label_address2 : \n"; + echo "$label_address3 : \n"; + echo "$label_city : \n"; + echo "$label_state:   \n"; + echo " $label_postal_code: \n"; - echo "$label_province : \n"; - echo "Country : \n"; - echo "$label_phone_number : \n"; - echo "$label_phone_code : \n"; - echo "$label_alt_phone : \n"; - echo "$label_email : \n"; - echo "$label_security_phrase : \n"; - echo "$label_vendor_lead_code : \n"; - echo "Rank : \n"; - echo "Owner : \n"; - echo "$label_comments : \n"; + echo "$label_province : \n"; + echo "Country : \n"; + echo "$label_phone_number : \n"; + echo "$label_phone_code : \n"; + echo "$label_alt_phone : \n"; + echo "$label_email : \n"; + echo "$label_security_phrase : \n"; + echo "$label_vendor_lead_code : \n"; + echo "Rank : \n"; + echo "Owner : \n"; + echo "$label_comments : \n"; } if ($lead_id != 'NEW')