ViciDial/ViciDialSVN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added additional $VLforce_index flags in hopper loading script, for high-volume dialing systems

Browse Source 
Fix for user-group, in-group and campaign allowed/permissions matching issues
Added updated Greek translation file

git-svn-id: svn://192.168.202.10@3065 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2019-02-16 13:56:59 +00:00
parent ba54547577
commit c56407d8ed
14 changed files with 7266 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agc_2-X/trunk/www/vicidial/admin.php
+45 -28
View File
@@ -4467,12 +4467,13 @@ else
# 181116-1133 - Fix for DID server IP de-assignment
# 190108-0806 - Added manual_dial_validation system and campaign options, update date for 2019
# 190121-2019 - Added RA_AGENT_PHONE on-hook agent option
# 190207-2301 - Fix for user-group, in-group and campaign allowed/permissions matching issues
#
# 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-697a';
$build = '190121-2019';
$admin_version = '2.14-698a';
$build = '190207-2301';
$STARTtime = date("U");
$SQLdate = date("Y-m-d H:i:s");
@@ -5643,7 +5644,7 @@ if ( ( (strlen($ADD)>4) and ($ADD < 99998) ) or ($ADD==3) or (($ADD>20) and ($AD
$UGcampaign_ct = count($UGcampaigns);
while ($p < $UGcampaign_ct)
{
if ($campaign_id_values[$o] == $UGcampaigns[$p])
if ($campaign_id_values[$o] === $UGcampaigns[$p])
{$RANK_camp_active++; $GRADE_camp_active++;}
$p++;
}
@@ -5863,7 +5864,7 @@ if ( ( (strlen($ADD)>4) and ($ADD < 99998) ) or ($ADD==3) or (($ADD>20) and ($AD
if (is_array($groups)) {$group_ct = count($groups);} else {$group_ct=0;}
while ($p < $group_ct)
{
if ($group_id_values[$o] == $groups[$p])
if ($group_id_values[$o] === $groups[$p])
{
$groups_list .= " CHECKED";
$RANKgroups_list .= " CHECKED";
@@ -5875,7 +5876,7 @@ if ( ( (strlen($ADD)>4) and ($ADD < 99998) ) or ($ADD==3) or (($ADD>20) and ($AD
if (is_array($XFERgroups)) {$XFERgroup_ct = count($XFERgroups);} else {$XFERgroup_ct=0;}
while ($p < $XFERgroup_ct)
{
if ($group_id_values[$o] == $XFERgroups[$p])
if ($group_id_values[$o] === $XFERgroups[$p])
{
$XFERgroups_list .= " CHECKED";
$XFERgroups_value .= " $group_id_values[$o]";
@@ -6006,13 +6007,13 @@ if ( ($ADD==211111) or ($ADD==311111) or ($ADD==411111) or ($ADD==511111) or ($A
$p=0;
while ($p<1000)
{
if ( ($campaign_id_value == $campaigns[$p]) and (strlen($campaign_id_value) > 1) )
if ( ($campaign_id_value === $campaigns[$p]) and (strlen($campaign_id_value) > 1) )
{
# echo "<!-- X $p|$campaign_id_value|$campaigns[$p]| -->";
$campaigns_list .= " CHECKED";
$campaigns_value .= " $campaign_id_value";
}
if ($campaign_id_value == $qc_campaigns[$p])
if ($campaign_id_value === $qc_campaigns[$p])
{
$qc_campaigns_list .= " CHECKED";
$qc_campaigns_value .= " $campaign_id_value";
@@ -6039,7 +6040,7 @@ if ( ($ADD==211111) or ($ADD==311111) or ($ADD==411111) or ($ADD==511111) or ($A
$p=0;
while ($p<2000)
{
if ( ($group_id_value == $qc_groups[$p]) and (strlen($group_id_value) > 1) )
if ( ($group_id_value === $qc_groups[$p]) and (strlen($group_id_value) > 1) )
{
$qc_groups_list .= " CHECKED";
$qc_groups_value .= " $group_id_value";
@@ -11013,7 +11014,9 @@ if ($ADD==2011)
$affected_rowsC = mysqli_affected_rows($link);
# add new in-group to user's agent-selected in-groups
$stmtD="UPDATE vicidial_users set closer_campaigns=REPLACE( closer_campaigns, ' $source_group_id ', ' $source_group_id $group_id ' ) where closer_campaigns LIKE \"% $source_group_id %\" and closer_campaigns NOT LIKE \"% $group_id %\";";
$SQL_group_id = preg_replace("/_/",'\\_',$group_id);
$SQL_source_group_id = preg_replace("/_/",'\\_',$source_group_id);
$stmtD="UPDATE vicidial_users set closer_campaigns=REPLACE( closer_campaigns, ' $source_group_id ', ' $source_group_id $group_id ' ) where closer_campaigns LIKE \"% $SQL_source_group_id %\" and closer_campaigns NOT LIKE \"% $SQL_group_id %\";";
$rslt=mysql_to_mysqli($stmtD, $link);
$affected_rowsD = mysqli_affected_rows($link);
@@ -11101,7 +11104,9 @@ if ( ($ADD==2911) and ($SSallow_emails>0) )
$affected_rowsC = mysqli_affected_rows($link);
# add new in-group to user's agent-selected in-groups
$stmtD="UPDATE vicidial_users set closer_campaigns=REPLACE( closer_campaigns, ' $source_group_id ', ' $source_group_id $group_id ' ) where closer_campaigns LIKE \"% $source_group_id %\" and closer_campaigns NOT LIKE \"% $group_id %\";";
$SQL_group_id = preg_replace("/_/",'\\_',$group_id);
$SQL_source_group_id = preg_replace("/_/",'\\_',$source_group_id);
$stmtD="UPDATE vicidial_users set closer_campaigns=REPLACE( closer_campaigns, ' $source_group_id ', ' $source_group_id $group_id ' ) where closer_campaigns LIKE \"% $SQL_source_group_id %\" and closer_campaigns NOT LIKE \"% $SQL_group_id %\";";
$rslt=mysql_to_mysqli($stmtD, $link);
$affected_rowsD = mysqli_affected_rows($link);
@@ -11188,7 +11193,9 @@ if ( ($ADD==29111) and ($SSallow_chats>0) )
$rslt=mysql_to_mysqli($stmtC, $link);
# add new in-group to user's agent-selected in-groups
$stmtD="UPDATE vicidial_users set closer_campaigns=REPLACE( closer_campaigns, ' $source_group_id ', ' $source_group_id $group_id ' ) where closer_campaigns LIKE \"% $source_group_id %\" and closer_campaigns NOT LIKE \"% $group_id %\";";
$SQL_group_id = preg_replace("/_/",'\\_',$group_id);
$SQL_source_group_id = preg_replace("/_/",'\\_',$source_group_id);
$stmtD="UPDATE vicidial_users set closer_campaigns=REPLACE( closer_campaigns, ' $source_group_id ', ' $source_group_id $group_id ' ) where closer_campaigns LIKE \"% $SQL_source_group_id %\" and closer_campaigns NOT LIKE \"% $SQL_group_id %\";";
$rslt=mysql_to_mysqli($stmtD, $link);
$affected_rowsD = mysqli_affected_rows($link);
@@ -14334,7 +14341,7 @@ if ($ADD==41)
$group_ct = count($groups);
while ($p < $group_ct)
{
if ($group_id_values[$o] == $groups[$p])
if ($group_id_values[$o] === $groups[$p])
{
$groups_list .= " CHECKED";
$groups_value .= " $group_id_values[$o]";
@@ -27753,7 +27760,7 @@ if ($ADD==331)
$group_ct = count($groups);
while ($p < $group_ct)
{
if ($group_id_values[$o] == $groups[$p])
if ($group_id_values[$o] === $groups[$p])
{
$groups_list .= " CHECKED";
$groups_value .= " $group_id_values[$o]";
@@ -28132,7 +28139,8 @@ if ($ADD==3111)
$allowed_campaigns_count=0;
$allowed_campaigns_warning='';
$stmt="SELECT count(*) from vicidial_campaigns where closer_campaigns LIKE \"% $query_group_id %\" $LOGallowed_campaignsSQL;";
$SQL_query_group_id = preg_replace("/_/",'\\_',$query_group_id);
$stmt="SELECT count(*) from vicidial_campaigns where closer_campaigns LIKE \"% $SQL_query_group_id %\" $LOGallowed_campaignsSQL;";
$rslt=mysql_to_mysqli($stmt, $link);
$campin_to_print = mysqli_num_rows($rslt);
$vc_allowed_ct=0;
@@ -28856,7 +28864,7 @@ if ($ADD==3111)
$p=0;
while ($p < $QCs_to_print)
{
if ($rowx[0] == $QCstatuses[$p])
if ($rowx[0] === $QCstatuses[$p])
{
$qc_statuses_list .= " CHECKED";
}
@@ -28881,7 +28889,7 @@ if ($ADD==3111)
$p=0;
while ($p < $QCs_to_print)
{
if ($rowx[0] == $QCstatuses[$p])
if ($rowx[0] === $QCstatuses[$p])
{
$qc_statuses_list .= " CHECKED";
}
@@ -29196,9 +29204,11 @@ if ($ADD==3111)
echo "<B>"._QXZ("CAMPAIGNS ALLOWING THIS IN-GROUP").":</B><BR>\n";
echo "<TABLE>\n";
$stmt="SELECT campaign_id,campaign_name from vicidial_campaigns where closer_campaigns LIKE \"% $group_id %\" $LOGallowed_campaignsSQL;";
$SQL_group_id = preg_replace("/_/",'\\_',$group_id);
$stmt="SELECT campaign_id,campaign_name from vicidial_campaigns where closer_campaigns LIKE \"% $SQL_group_id %\" $LOGallowed_campaignsSQL;";
$rslt=mysql_to_mysqli($stmt, $link);
$campin_to_print = mysqli_num_rows($rslt);
if ($DB > 0) {echo "|$SQL_group_id|$group_id|$stmt|\n";}
$o=0;
while ($campin_to_print > $o)
{
@@ -29482,7 +29492,8 @@ if ($ADD==3811)
$allowed_campaigns_count=0;
$allowed_campaigns_warning='';
$stmt="SELECT count(*) from vicidial_campaigns where closer_campaigns LIKE \"% $query_group_id %\" $LOGallowed_campaignsSQL;";
$SQL_group_id = preg_replace("/_/",'\\_',$query_group_id);
$stmt="SELECT count(*) from vicidial_campaigns where closer_campaigns LIKE \"% $SQL_group_id %\" $LOGallowed_campaignsSQL;";
$rslt=mysql_to_mysqli($stmt, $link);
$campin_to_print = mysqli_num_rows($rslt);
$vc_allowed_ct=0;
@@ -29684,7 +29695,7 @@ if ($ADD==3811)
$p=0;
while ($p < $QCs_to_print)
{
if ($rowx[0] == $QCstatuses[$p])
if ($rowx[0] === $QCstatuses[$p])
{
$qc_statuses_list .= " CHECKED";
}
@@ -29709,7 +29720,7 @@ if ($ADD==3811)
$p=0;
while ($p < $QCs_to_print)
{
if ($rowx[0] == $QCstatuses[$p])
if ($rowx[0] === $QCstatuses[$p])
{
$qc_statuses_list .= " CHECKED";
}
@@ -30009,7 +30020,8 @@ if ($ADD==3811)
echo "<B>"._QXZ("CAMPAIGNS ALLOWING THIS IN-GROUP").":</B><BR>\n";
echo "<TABLE>\n";
$stmt="SELECT campaign_id,campaign_name from vicidial_campaigns where closer_campaigns LIKE \"% $group_id %\" $LOGallowed_campaignsSQL;";
$SQL_group_id = preg_replace("/_/",'\\_',$group_id);
$stmt="SELECT campaign_id,campaign_name from vicidial_campaigns where closer_campaigns LIKE \"% $SQL_group_id %\" $LOGallowed_campaignsSQL;";
$rslt=mysql_to_mysqli($stmt, $link);
$campin_to_print = mysqli_num_rows($rslt);
$o=0;
@@ -30300,7 +30312,8 @@ if ($ADD==3911)
$allowed_campaigns_count=0;
$allowed_campaigns_warning='';
$stmt="SELECT count(*) from vicidial_campaigns where closer_campaigns LIKE \"% $query_group_id %\" $LOGallowed_campaignsSQL;";
$SQL_group_id = preg_replace("/_/",'\\_',$query_group_id);
$stmt="SELECT count(*) from vicidial_campaigns where closer_campaigns LIKE \"% $SQL_group_id %\" $LOGallowed_campaignsSQL;";
$rslt=mysql_to_mysqli($stmt, $link);
$campin_to_print = mysqli_num_rows($rslt);
$vc_allowed_ct=0;
@@ -30493,7 +30506,7 @@ if ($ADD==3911)
$p=0;
while ($p < $QCs_to_print)
{
if ($rowx[0] == $QCstatuses[$p])
if ($rowx[0] === $QCstatuses[$p])
{
$qc_statuses_list .= " CHECKED";
}
@@ -30518,7 +30531,7 @@ if ($ADD==3911)
$p=0;
while ($p < $QCs_to_print)
{
if ($rowx[0] == $QCstatuses[$p])
if ($rowx[0] === $QCstatuses[$p])
{
$qc_statuses_list .= " CHECKED";
}
@@ -30803,7 +30816,8 @@ if ($ADD==3911)
echo "<B>"._QXZ("CAMPAIGNS ALLOWING THIS CHAT GROUP").":</B><BR>\n";
echo "<TABLE>\n";
$stmt="SELECT campaign_id,campaign_name from vicidial_campaigns where closer_campaigns LIKE \"% $group_id %\" $LOGallowed_campaignsSQL;";
$SQL_group_id = preg_replace("/_/",'\\_',$group_id);
$stmt="SELECT campaign_id,campaign_name from vicidial_campaigns where closer_campaigns LIKE \"% $SQL_group_id %\" $LOGallowed_campaignsSQL;";
$rslt=mysql_to_mysqli($stmt, $link);
$campin_to_print = mysqli_num_rows($rslt);
$o=0;
@@ -38378,7 +38392,8 @@ if ($ADD==1000)
{
$allowed_campaigns_count=0;
$allowed_campaigns_warning='';
$stmt="SELECT count(*) from vicidial_campaigns where closer_campaigns LIKE \"% $group_id_ary[$o] %\" $LOGallowed_campaignsSQL;";
$SQL_group_id = preg_replace("/_/",'\\_',$group_id_ary[$o]);
$stmt="SELECT count(*) from vicidial_campaigns where closer_campaigns LIKE \"% $SQL_group_id %\" $LOGallowed_campaignsSQL;";
$rslt=mysql_to_mysqli($stmt, $link);
$campin_to_print = mysqli_num_rows($rslt);
$vc_allowed_ct=0;
@@ -38461,7 +38476,8 @@ if ( ($ADD==1800) and ($SSallow_emails>0) )
$allowed_campaigns_warning='';
## Get campaign allowed count
$ct_stmt="SELECT count(*) from vicidial_campaigns where closer_campaigns LIKE \"% $row[0] %\" $LOGallowed_campaignsSQL;";
$SQL_group_id = preg_replace("/_/",'\\_',$row[0]);
$ct_stmt="SELECT count(*) from vicidial_campaigns where closer_campaigns LIKE \"% $SQL_group_id %\" $LOGallowed_campaignsSQL;";
$ct_rslt=mysql_to_mysqli($ct_stmt, $link);
$ct_row=mysqli_fetch_row($ct_rslt);
$email_allowed_campaigns_count=$ct_row[0];
@@ -38520,7 +38536,8 @@ if ( ($ADD==1900) and ($SSallow_chats>0) )
$allowed_campaigns_warning='';
## Get campaign allowed count
$ct_stmt="SELECT count(*) from vicidial_campaigns where closer_campaigns LIKE \"% $row[0] %\" $LOGallowed_campaignsSQL;";
$SQL_group_id = preg_replace("/_/",'\\_',$row[0]);
$ct_stmt="SELECT count(*) from vicidial_campaigns where closer_campaigns LIKE \"% $SQL_group_id %\" $LOGallowed_campaignsSQL;";
$ct_rslt=mysql_to_mysqli($ct_stmt, $link);
$ct_row=mysqli_fetch_row($ct_rslt);
$chat_allowed_campaigns_count=$ct_row[0];