From 0a046295ed86aa3dcb2c9fea6f65881be960cedc Mon Sep 17 00:00:00 2001 From: mattf Date: Wed, 12 Dec 2012 21:34:30 +0000 Subject: [PATCH] Standardization of list_id fields at 19 digits git-svn-id: svn://192.168.202.10@1904 3d104415-ff17-0410-8863-d5cf3c621b8a --- extras/MySQL_AST_CREATE_tables.sql | 6 +++--- extras/upgrade_2.6.sql | 2 +- www/vicidial/admin.php | 23 ++++++++++++----------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/extras/MySQL_AST_CREATE_tables.sql b/extras/MySQL_AST_CREATE_tables.sql index 406a7c16..01d35b63 100644 --- a/extras/MySQL_AST_CREATE_tables.sql +++ b/extras/MySQL_AST_CREATE_tables.sql @@ -2616,7 +2616,7 @@ CREATE INDEX ci_last_name on contact_information (last_name); CREATE TABLE dialable_inventory_snapshots ( snapshot_id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, snapshot_time DATETIME default NULL, -list_id BIGINT(14) unsigned default NULL, +list_id BIGINT(14) UNSIGNED default NULL, list_name VARCHAR(30) default NULL, list_description VARCHAR(255), campaign_id VARCHAR(8) default NULL, @@ -2671,7 +2671,7 @@ CREATE TABLE vicidial_custom_leadloader_templates ( template_id VARCHAR(20) PRIMARY KEY NOT NULL, template_name VARCHAR(30) DEFAULT NULL, template_description VARCHAR(255) DEFAULT NULL, -list_id INT(10) UNSIGNED DEFAULT NULL, +list_id BIGINT(14) UNSIGNED DEFAULT NULL, standard_variables TEXT, custom_table VARCHAR(20) DEFAULT NULL, custom_variables TEXT @@ -2732,7 +2732,7 @@ comment_id BIGINT(20) unsigned NOT NULL AUTO_INCREMENT, lead_id INT(11) NOT NULL, user_id INT(11) NOT NULL, timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, -list_id INT(11) NOT NULL, +list_id BIGINT(14) UNSIGNED NOT NULL, campaign_id INT(11) NOT NULL, comment VARCHAR(255) COLLATE utf8_unicode_ci NOT NULL, hidden TINYINT(1) DEFAULT NULL, diff --git a/extras/upgrade_2.6.sql b/extras/upgrade_2.6.sql index e109e346..97986b12 100644 --- a/extras/upgrade_2.6.sql +++ b/extras/upgrade_2.6.sql @@ -121,7 +121,7 @@ comment_id BIGINT(20) unsigned NOT NULL AUTO_INCREMENT, lead_id INT(11) NOT NULL, user_id INT(11) NOT NULL, timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, -list_id INT(11) NOT NULL, +list_id BIGINT(14) UNSIGNED NOT NULL, campaign_id INT(11) NOT NULL, comment VARCHAR(255) COLLATE utf8_unicode_ci NOT NULL, hidden TINYINT(1) DEFAULT NULL, diff --git a/www/vicidial/admin.php b/www/vicidial/admin.php index bace2d2d..575d2d06 100644 --- a/www/vicidial/admin.php +++ b/www/vicidial/admin.php @@ -3207,12 +3207,13 @@ else # 121130-1425 - Fixed user group permissions issue with allowed campaigns modifications of user groups # 121205-1619 - Added parentheses around filter SQL when in SQL queries # 121206-0630 - Added inbound lead search feature +# 121212-1529 - Standardization of list_id fields at 19 digits in forms # # 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.6-389a'; -$build = '121206-0630'; +$admin_version = '2.6-390a'; +$build = '121212-1529'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -9533,7 +9534,7 @@ if ($ADD==111) } else { - echo "List ID: (digits only)$NWB#vicidial_lists-list_id$NWE\n"; + echo "List ID: (digits only)$NWB#vicidial_lists-list_id$NWE\n"; } echo "List Name: $NWB#vicidial_lists-list_name$NWE\n"; echo "List Description: $NWB#vicidial_lists-list_description$NWE\n"; @@ -12458,7 +12459,7 @@ if ($ADD==211) {echo "
LIST NOT ADDED - there is already a list in the system with this ID\n";} else { - if ( (strlen($campaign_id) < 2) or (strlen($list_name) < 2) or ($list_id < 100) or (strlen($list_id) > 8) ) + if ( (strlen($campaign_id) < 2) or (strlen($list_name) < 2) or ($list_id < 100) or (strlen($list_id) > 19) ) { echo "
LIST NOT ADDED - Please go back and look at the data you entered\n"; echo "
List ID must be between 2 and 8 characters in length\n"; @@ -22066,7 +22067,7 @@ if ($ADD==31) echo "Manual Dial Override: $NWB#vicidial_campaigns-manual_dial_override$NWE\n"; - echo "Manual Dial List ID: $NWB#vicidial_campaigns-manual_dial_list_id$NWE\n"; + echo "Manual Dial List ID: $NWB#vicidial_campaigns-manual_dial_list_id$NWE\n"; echo "Manual Dial Filter: $NWB#vicidial_campaigns-manual_dial_filter$NWE\n"; @@ -25939,7 +25940,7 @@ if ($ADD==3111) echo "$IGhandle_method_list\n"; echo "
Search Method: \n"; - echo "   List ID: "; + echo "   List ID: "; echo "
Campaign ID: \n"; echo "   Phone Code: "; @@ -26039,7 +26040,7 @@ if ($ADD==3111) echo "Wait Time Option After Press Filename: audio chooser $NWB#vicidial_inbound_groups-wait_time_option_callback_filename$NWE\n"; - echo "Wait Time Option Callback List ID: $NWB#vicidial_inbound_groups-wait_time_option_callback_list_id$NWE\n"; + echo "Wait Time Option Callback List ID: $NWB#vicidial_inbound_groups-wait_time_option_callback_list_id$NWE\n"; echo "Wait Hold Option Priority: $NWB#vicidial_inbound_groups-wait_hold_option_priority$NWE\n"; @@ -26073,7 +26074,7 @@ if ($ADD==3111) echo "Hold Time Option After Press Filename: audio chooser $NWB#vicidial_inbound_groups-hold_time_option_callback_filename$NWE\n"; - echo "Hold Time Option Callback List ID: $NWB#vicidial_inbound_groups-hold_time_option_callback_list_id$NWE\n"; + echo "Hold Time Option Callback List ID: $NWB#vicidial_inbound_groups-hold_time_option_callback_list_id$NWE\n"; echo "Agent Alert Filename: audio chooser $NWB#vicidial_inbound_groups-agent_alert_exten$NWE\n"; @@ -26742,7 +26743,7 @@ if ($ADD==3311) echo "$NWB#vicidial_inbound_dids-group_id$NWE\n"; echo "In-Group Call Handle Method: $NWB#vicidial_inbound_dids-call_handle_method$NWE\n"; echo "In-Group Agent Search Method: $NWB#vicidial_inbound_dids-agent_search_method$NWE\n"; - echo "In-Group List ID: $NWB#vicidial_inbound_dids-list_id$NWE\n"; + echo "In-Group List ID: $NWB#vicidial_inbound_dids-list_id$NWE\n"; echo "In-Group Campaign ID: $NWB#vicidial_inbound_dids-group_id$NWE\n"; echo "Filter In-Group Call Handle Method: $NWB#vicidial_inbound_dids-call_handle_method$NWE\n"; echo "Filter In-Group Agent Search Method: $NWB#vicidial_inbound_dids-agent_search_method$NWE\n"; - echo "Filter In-Group List ID: $NWB#vicidial_inbound_dids-list_id$NWE\n"; + echo "Filter In-Group List ID: $NWB#vicidial_inbound_dids-list_id$NWE\n"; echo "Filter In-Group Campaign ID: $NWB#vicidial_call_menu-ingroup_settings$NWE\n"; echo "
Search Method: \n"; - echo "   List ID: "; + echo "   List ID: "; echo "
Campaign ID: \n"; echo "   Phone Code: ";