From e07509d24ebb10dab01332456b52ef41b268dae8 Mon Sep 17 00:00:00 2001 From: mattf Date: Tue, 14 Nov 2017 16:04:20 +0000 Subject: [PATCH] Fixed issue with admin log viewer for logs of modifications made by deleted users in admin.php git-svn-id: svn://192.168.202.10@2852 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/www/vicidial/admin.php | 63 +++++++++++++++++++--------- 1 file changed, 44 insertions(+), 19 deletions(-) diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index 8745ba22..1b9eaa45 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -4199,12 +4199,13 @@ else # 171018-1314 - Added scheduled_callbacks_email_alert campaign option # 171018-2234 - Added server function to clear agent conferences # 171028-0913 - Added Real-Time Whiteboard Report +# 171114-1100 - Fixed issue with admin log viewer for logs of modifications made by deleted users # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 9 to access this page the first time -$admin_version = '2.14-639a'; -$build = '171028-0913'; +$admin_version = '2.14-640a'; +$build = '171114-1100'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -38906,7 +38907,7 @@ if ($ADD==730000000000000) echo "
\n"; echo ""; - $stmt="SELECT admin_log_id,event_date,val.user,ip_address,event_section,event_type,record_id,event_code,event_notes,event_sql,full_name,val.user_group from vicidial_admin_log val, vicidial_users vu where admin_log_id='$stage' and val.user=vu.user $valLOGadmin_viewable_groupsSQL;"; + $stmt="SELECT admin_log_id,event_date,user,ip_address,event_section,event_type,record_id,event_code,event_notes,event_sql,user_group from vicidial_admin_log where admin_log_id='$stage' $LOGadmin_viewable_groupsSQL;"; if ($DB > 0) {echo "$stmt\n";} $rslt=mysql_to_mysqli($stmt, $link); $logs_to_print = mysqli_num_rows($rslt); @@ -38914,46 +38915,70 @@ if ($ADD==730000000000000) if ($logs_to_print > 0) { $row=mysqli_fetch_row($rslt); + + $log_id = $row[0]; + $log_date_time = $row[1]; + $log_user = $row[2]; + $log_ip = $row[3]; + $log_section = $row[4]; + $log_type = $row[5]; + $log_record_id = $row[6]; + $log_description = $row[7]; + $log_notes = $row[8]; + $log_sql = $row[9]; + $new_sql = $row[9]; + $log_user_group = $row[10]; + + $stmt="SELECT full_name from vicidial_users where user='$log_user';"; + if ($DB > 0) {echo "$stmt\n";} + $rslt=mysql_to_mysqli($stmt, $link); + $user_to_print = mysqli_num_rows($rslt); + if ($user_to_print > 0) + { + $rowx=mysqli_fetch_row($rslt); + $log_full_name = $rowx[0]; + } + echo "
"._QXZ("ADMIN CHANGE LOG: Record Detail")." - $stage

\n"; echo "
\n"; echo ""; echo ""; - echo ""; + echo ""; echo "\n"; echo ""; - echo ""; + echo ""; echo "\n"; echo ""; - echo ""; + echo ""; echo "\n"; echo ""; - echo ""; + echo ""; echo "\n"; echo ""; - echo ""; + echo ""; echo "\n"; echo ""; - echo ""; + echo ""; echo "\n"; echo ""; - echo ""; + echo ""; echo "\n"; echo ""; - echo ""; + echo ""; echo "\n"; echo ""; - echo ""; + echo ""; echo "\n"; echo ""; - echo ""; + echo ""; echo "\n"; - $new_sql = $row[9]; - $row[9] = preg_replace('/\',/i', '\' ,',$row[9]); - $row[9] = preg_replace("/\|/","
",$row[9]); - echo ""; - echo ""; - $stmt="SELECT admin_log_id,event_date,val.user,ip_address,event_section,event_type,record_id,event_code,event_notes,event_sql,full_name,val.user_group from vicidial_admin_log val, vicidial_users vu where event_section='$row[4]' and event_type='$row[5]' and record_id='$row[6]' and event_code='$row[7]' and admin_log_id < $row[0] and val.user=vu.user $valLOGadmin_viewable_groupsSQL order by admin_log_id desc;"; + $log_sql = preg_replace('/\',/i', '\' ,',$log_sql); + $log_sql = preg_replace("/\|/","
",$log_sql); + echo ""; + echo ""; + + $stmt="SELECT admin_log_id,event_date,user,ip_address,event_section,event_type,record_id,event_code,event_notes,event_sql,user_group from vicidial_admin_log where event_section='$log_section' and event_type='$log_type' and record_id='$log_record_id' and event_code='$log_description' and admin_log_id < $log_id $LOGadmin_viewable_groupsSQL order by admin_log_id desc;"; if ($DB > 0) {echo "$stmt\n";} $rslt=mysql_to_mysqli($stmt, $link); $last_to_print = mysqli_num_rows($rslt);
"._QXZ("ID").": $row[0]$log_id
"._QXZ("DATE TIME").": $row[1]$log_date_time
"._QXZ("USER").": $row[2] - $row[10]$log_user - $log_full_name
"._QXZ("IP").": $row[3]$log_ip
"._QXZ("SECTION").": $row[4]$log_section
"._QXZ("TYPE").": $row[5]$log_type
"._QXZ("RECORD ID").": $row[6]$log_record_id
"._QXZ("DESCRIPTION").": $row[7]$log_description
"._QXZ("ADMIN GROUP").": $row[11]$log_user_group
"._QXZ("NOTES").": $row[8]$log_notes
"._QXZ("SQL").":

$row[9]

"._QXZ("SQL").":

$log_sql