From 4350942cd617b6ed617f047c61edfa48b4884559 Mon Sep 17 00:00:00 2001 From: mattf Date: Sun, 16 Aug 2020 13:33:40 +0000 Subject: [PATCH] Added CID Groups to several labels to Bulk Tools script Removed the link to delete the 'default' DID entry in admin.php git-svn-id: svn://192.168.202.10@3278 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/www/vicidial/admin.php | 10 +++++-- .../trunk/www/vicidial/admin_bulk_tools.php | 29 ++++++++++--------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index e129ad8f..2a335d13 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -4705,12 +4705,13 @@ else # 200719-1645 - Added EVERY_NEW_ALLCALL option for QM PAUSEREASON system setting # 200814-2249 - Added International DNC scrub options # 200815-0015 - Added another modify_leads option for users +# 200816-0912 - Removed the ability to delete the 'default' DID entry # # 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-765a'; -$build = '200815-0015'; +$admin_version = '2.14-766a'; +$build = '200816-0912'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -32918,7 +32919,10 @@ if ($ADD==3311) } if ($LOGdelete_dids > 0) { - echo "

"._QXZ("DELETE THIS DID")."\n"; + if ($did_pattern == 'default') + {echo "

"._QXZ("DELETE THIS DID")."\n";} + else + {echo "

"._QXZ("DELETE THIS DID")."\n";} } if ( ($LOGuser_level >= 9) and ( (preg_match("/Administration Change Log/",$LOGallowed_reports)) or (preg_match("/ALL REPORTS/",$LOGallowed_reports)) ) ) { diff --git a/agc_2-X/trunk/www/vicidial/admin_bulk_tools.php b/agc_2-X/trunk/www/vicidial/admin_bulk_tools.php index cb8bfdfb..7296929e 100644 --- a/agc_2-X/trunk/www/vicidial/admin_bulk_tools.php +++ b/agc_2-X/trunk/www/vicidial/admin_bulk_tools.php @@ -27,13 +27,14 @@ # 180502-2115 - Added new help display # 200108-0956 - Added CID Group type of NONE # 200405-1738 - Fix for Issue #1202 +# 200816-0930 - Added CID Groups to several labels # require("dbconnect_mysqli.php"); require("functions.php"); -$version = '2.14-21'; -$build = '200405-1738'; +$version = '2.14-22'; +$build = '200816-0930'; $PHP_AUTH_USER=$_SERVER['PHP_AUTH_USER']; $PHP_AUTH_PW=$_SERVER['PHP_AUTH_PW']; @@ -308,11 +309,11 @@ if ($form_to_run == "help") echo "

"; echo "
"; - echo ""._QXZ("AC-CID Bulk Add")." - "._QXZ("This allows you to paste in a listing of CIDs to insert into a campaign AC-CID list or CID Group list. There are two methods to choose from: CIDs must be between 6 and 20 digits in length and only digits 0-9 are allowed. Optionally, you can have the AC-CIDs set to active upon insertion."); + echo ""._QXZ("CID Groups and AC-CID Bulk Add")." - "._QXZ("This allows you to paste in a listing of CIDs to insert into a campaign AC-CID list or CID Group list. There are two methods to choose from: CIDs must be between 6 and 20 digits in length and only digits 0-9 are allowed. Optionally, you can have the AC-CIDs set to active upon insertion."); echo "

"; echo "
"; - echo ""._QXZ("AC-CID Bulk Delete")." - "._QXZ("This will delete the Areacode Caller ID entries you select from the next screen based on the campaign or CID group you select here. Setting Clear All CIDs to YES will bypass the AC-CID selection and wipe all AC-CIDs for the selected campaign or CID group."); + echo ""._QXZ("CID Groups and AC-CID Bulk Delete")." - "._QXZ("This will delete the Areacode Caller ID entries you select from the next screen based on the campaign or CID group you select here. Setting Clear All CIDs to YES will bypass the AC-CID selection and wipe all AC-CIDs for the selected campaign or CID group."); echo "















"; exit; @@ -473,7 +474,7 @@ if ($form_to_run == "ACCID") if (empty($ACCIDto_insert[0])) { echo "
"._QXZ("Go back, nothing is going to be created.")." "; - echo "
"._QXZ("The following AC-CIDs are duplicates and will not be created").": "; + echo "
"._QXZ("The following CID Groups or AC-CIDs are duplicates and will not be created").": "; if (empty($ACCIDduplicate[0])) {echo "
"._QXZ("NONE");} $i = 0; while ($i < count($ACCIDduplicate)) @@ -481,7 +482,7 @@ if ($form_to_run == "ACCID") echo "
$ACCIDduplicate[$i]"; $i++; } - echo "
"._QXZ("The following AC-CIDs are of invalid length and will not be created").": "; + echo "
"._QXZ("The following CID Groups or AC-CIDs are of invalid length and will not be created").": "; if (empty($ACCIDbadlen[0])) {echo "
"._QXZ("NONE");} $i = 0; while ($i < count($ACCIDbadlen)) @@ -1714,7 +1715,7 @@ else if ( $modify_campaigns < 1 ) { echo "
"; - echo "\n"; + echo "\n"; echo "\n"; echo "
"._QXZ("AC-CID Bulk Add")."$NWB#ACCIDADD$NWE
"._QXZ("CID Groups and AC-CID Bulk Add")."$NWB#ACCIDADD$NWE
"._QXZ("You do not have permission to use this section.")."
\n"; } @@ -1725,13 +1726,13 @@ else echo ""; echo "
"; echo ""; - echo "\n"; + echo "\n"; echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "
"._QXZ("AC-CID Bulk Add")."$NWB#ACCIDADD$NWE
"._QXZ("CID Groups and AC-CID Bulk Add")."$NWB#ACCIDADD$NWE
"._QXZ("Method").":
"._QXZ("Campaign").":\n"; + echo "
"._QXZ("Campaign or CID Group").":\n"; $ACCIDcampaigns_to_copy = array(); $SQL="SELECT campaign_id,campaign_name FROM vicidial_campaigns WHERE $allowed_campaignsSQL AND $admin_viewable_groupsSQL ORDER BY campaign_id ASC;"; @@ -1780,7 +1781,7 @@ else echo "\n"; echo "\n"; echo "
"._QXZ("AC-CIDs").":
"._QXZ("CID Group and AC-CID entries").":
\n"; echo ""; @@ -1791,7 +1792,7 @@ else if ( $delete_campaigns < 1 ) { echo "
"; - echo "\n"; + echo "\n"; echo "\n"; echo "
"._QXZ("AC-CID Bulk Delete")."$NWB#ACCIDDELETE$NWE
"._QXZ("CID Groups and AC-CID Bulk Delete")."$NWB#ACCIDDELETE$NWE
"._QXZ("You do not have permission to use this section.")."
\n"; } @@ -1802,8 +1803,8 @@ else echo ""; echo "
"; echo ""; - echo "\n"; - echo "\n"; + echo "\n"; - echo "\n";
"._QXZ("AC-CID Bulk Delete")."$NWB#ACCIDDELETE$NWE
"._QXZ("Campaign").":\n"; + echo "
"._QXZ("CID Groups and AC-CID Bulk Delete")."$NWB#ACCIDDELETE$NWE
"._QXZ("Campaign or CID Group").":\n"; $ACCIDdelete_campaign_selection = array(); $SQL="SELECT campaign_id,campaign_name from vicidial_campaigns WHERE campaign_id IN (select distinct campaign_id from vicidial_campaign_cid_areacodes) AND $allowed_campaignsSQL AND $admin_viewable_groupsSQL ORDER BY campaign_id ASC;"; @@ -1847,7 +1848,7 @@ else } echo "
"._QXZ("Clear all AC-CIDs?").":
"._QXZ("Clear all CID Group or AC-CID entries?").":