From 4e295c555824219281285d6eeec97155e3fd37cc Mon Sep 17 00:00:00 2001 From: mattf Date: Sun, 13 Mar 2016 11:58:16 +0000 Subject: [PATCH] Changed AC-CID changes to log to the same entry instead of one per record git-svn-id: svn://192.168.202.10@2491 3d104415-ff17-0410-8863-d5cf3c621b8a --- extras/MySQL_AST_CREATE_tables.sql | 6 +++--- extras/upgrade_2.12.sql | 5 +++++ www/vicidial/admin.php | 33 ++++++++++++++++++++++-------- 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/extras/MySQL_AST_CREATE_tables.sql b/extras/MySQL_AST_CREATE_tables.sql index 36242761..f0bb9144 100644 --- a/extras/MySQL_AST_CREATE_tables.sql +++ b/extras/MySQL_AST_CREATE_tables.sql @@ -1873,8 +1873,8 @@ event_section VARCHAR(30) NOT NULL, event_type ENUM('ADD','COPY','LOAD','RESET','MODIFY','DELETE','SEARCH','LOGIN','LOGOUT','CLEAR','OVERRIDE','EXPORT','OTHER') default 'OTHER', record_id VARCHAR(50) NOT NULL, event_code VARCHAR(255) NOT NULL, -event_sql TEXT, -event_notes TEXT, +event_sql MEDIUMTEXT, +event_notes MEDIUMTEXT, user_group VARCHAR(20) default '---ALL---', index (user), index (event_section), @@ -3742,4 +3742,4 @@ UPDATE vicidial_configuration set value='1766' where name='qc_database_version'; UPDATE system_settings set vdc_agent_api_active='1'; -UPDATE system_settings SET db_schema_version='1455',db_schema_update_date=NOW(),reload_timestamp=NOW(); +UPDATE system_settings SET db_schema_version='1456',db_schema_update_date=NOW(),reload_timestamp=NOW(); diff --git a/extras/upgrade_2.12.sql b/extras/upgrade_2.12.sql index 160e80ac..4defa874 100644 --- a/extras/upgrade_2.12.sql +++ b/extras/upgrade_2.12.sql @@ -554,3 +554,8 @@ ALTER TABLE phones ADD webphone_volume ENUM('Y','N') default 'Y'; ALTER TABLE phones ADD webphone_debug ENUM('Y','N') default 'N'; UPDATE system_settings SET db_schema_version='1455',db_schema_update_date=NOW() where db_schema_version < 1455; + +ALTER TABLE vicidial_admin_log MODIFY event_sql MEDIUMTEXT; +ALTER TABLE vicidial_admin_log MODIFY event_notes MEDIUMTEXT; + +UPDATE system_settings SET db_schema_version='1456',db_schema_update_date=NOW() where db_schema_version < 1456; diff --git a/www/vicidial/admin.php b/www/vicidial/admin.php index 29d35635..8bb0b14a 100644 --- a/www/vicidial/admin.php +++ b/www/vicidial/admin.php @@ -3734,12 +3734,13 @@ else # 160305-2048 - Added alternate ivr(call menu) dtmf logging # 160306-1053 - Added new webphone options, added option to have carriers on all active asterisk servers # 160312-1931 - Added select/deselect all options to AC-CID modify page. Reworked max stats calculations +# 160313-0756 - Changed AC-CID changes to log to the same entry instead of one per record # # 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.12-542a'; -$build = '160312-1931'; +$admin_version = '2.12-543a'; +$build = '160313-0756'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -9265,6 +9266,9 @@ if ($ADD==202) $o++; } + $accid_modified=0; + $stmt_log=''; + $accid_log=''; $o=0; while ($accids_to_print > $o) { @@ -9288,21 +9292,27 @@ if ($ADD==202) } else { + $accid_modified++; echo ""._QXZ("AREACODE CID MODIFIED").": $Xareacode[$o] - $Xoutbound_cid[$o]
\n"; $stmt="UPDATE vicidial_campaign_cid_areacodes SET active='$Factive_value',cid_description='$Fcid_description_value' WHERE campaign_id='$campaign_id' and areacode='$Xareacode[$o]' and outbound_cid='$Xoutbound_cid[$o]';"; $rslt=mysql_to_mysqli($stmt, $link); - ### LOG INSERTION Admin Log Table ### - $SQL_log = "$stmt|"; - $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='CAMPAIGN_AC-CID', event_type='MODIFY', record_id='$campaign_id', event_code='ADMIN MODIFY CAMPAIGN AC-CID', event_sql=\"$SQL_log\", event_notes='CID: $Xareacode[$o] - $Xoutbound_cid[$o]';"; - if ($DB) {echo "|$stmt|\n";} - $rslt=mysql_to_mysqli($stmt, $link); + $stmt_log .= "$stmt|"; + $accid_log .= "CID: $Xareacode[$o] - $Xoutbound_cid[$o] - $Factive_value - $Fcid_description_value|"; } $o++; } + if ($accid_modified > 0) + { + ### LOG INSERTION Admin Log Table ### + $SQL_log = "$stmt_log|"; + $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='CAMPAIGN_AC-CID', event_type='MODIFY', record_id='$campaign_id', event_code='ADMIN MODIFY CAMPAIGN AC-CID', event_sql=\"$SQL_log\", event_notes='$accid_modified AC-CIDs MODIFIED. CHANGES: $accid_log';"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_to_mysqli($stmt, $link); + } } } $SUB=202; @@ -21972,6 +21982,11 @@ if ($ADD==31) echo "
\n"; echo "
\n"; + if ( ($LOGuser_level >= 9) and ( (preg_match("/Administration Change Log/",$LOGallowed_reports)) or (preg_match("/ALL REPORTS/",$LOGallowed_reports)) ) ) + { + echo "

"._QXZ("Click here to see Admin changes to this campaign")." AC-CID\n"; + } + echo "
\n"; }