\n";
#9BB9FB
diff --git a/agc_2-X/trunk/www/vicidial/admin_modify_lead.php b/agc_2-X/trunk/www/vicidial/admin_modify_lead.php
index 64c513a5..88917af4 100644
--- a/agc_2-X/trunk/www/vicidial/admin_modify_lead.php
+++ b/agc_2-X/trunk/www/vicidial/admin_modify_lead.php
@@ -8,7 +8,7 @@
# just needs to enter the leadID and then they can view and modify the
# information in the record for that lead
#
-# Copyright (C) 2014 Matt Florell LICENSE: AGPLv2
+# Copyright (C) 2015 Matt Florell LICENSE: AGPLv2
#
# CHANGES
#
@@ -64,6 +64,7 @@
# 141001-2200 - Finalized adding QXZ translation to all admin files
# 141128-0859 - Code cleanup for QXZ functions
# 141229-1745 - Added code for on-the-fly language translations display
+# 150107-1729 - Added ignore_group_on_search user option
#
require("dbconnect_mysqli.php");
@@ -271,15 +272,16 @@ if ( $modify_leads < 1 )
exit;
}
-$stmt="SELECT full_name,modify_leads,admin_hide_lead_data,admin_hide_phone_data,user_group,user_level from vicidial_users where user='$PHP_AUTH_USER';";
+$stmt="SELECT full_name,modify_leads,admin_hide_lead_data,admin_hide_phone_data,user_group,user_level,ignore_group_on_search from vicidial_users where user='$PHP_AUTH_USER';";
$rslt=mysql_to_mysqli($stmt, $link);
$row=mysqli_fetch_row($rslt);
-$LOGfullname = $row[0];
-$LOGmodify_leads = $row[1];
-$LOGadmin_hide_lead_data = $row[2];
-$LOGadmin_hide_phone_data = $row[3];
-$LOGuser_group = $row[4];
-$LOGuser_level = $row[5];
+$LOGfullname = $row[0];
+$LOGmodify_leads = $row[1];
+$LOGadmin_hide_lead_data = $row[2];
+$LOGadmin_hide_phone_data = $row[3];
+$LOGuser_group = $row[4];
+$LOGuser_level = $row[5];
+$LOGignore_group_on_search = $row[6];
$LOGallowed_listsSQL='';
$stmt="SELECT allowed_campaigns from vicidial_user_groups where user_group='$LOGuser_group';";
@@ -288,7 +290,7 @@ $rslt=mysql_to_mysqli($stmt, $link);
$row=mysqli_fetch_row($rslt);
$LOGallowed_campaigns = $row[0];
-if (!preg_match('/\-ALL/i', $LOGallowed_campaigns))
+if ( (!preg_match('/\-ALL/i', $LOGallowed_campaigns)) and ($LOGignore_group_on_search != '1') )
{
$rawLOGallowed_campaignsSQL = preg_replace("/ -/",'',$LOGallowed_campaigns);
$rawLOGallowed_campaignsSQL = preg_replace("/ /","','",$rawLOGallowed_campaignsSQL);
diff --git a/agc_2-X/trunk/www/vicidial/admin_search_lead.php b/agc_2-X/trunk/www/vicidial/admin_search_lead.php
index 486fe76a..88f218d9 100644
--- a/agc_2-X/trunk/www/vicidial/admin_search_lead.php
+++ b/agc_2-X/trunk/www/vicidial/admin_search_lead.php
@@ -1,7 +1,7 @@
LICENSE: AGPLv2
+# Copyright (C) 2015 Matt Florell LICENSE: AGPLv2
#
# AST GUI database administration search for lead info
# admin_modify_lead.php
@@ -40,6 +40,7 @@
# 141001-2200 - Finalized adding QXZ translation to all admin files
# 141124-1747 - Fixed issue #790
# 141229-1748 - Added code for on-the-fly language translations display
+# 150107-1728 - Added ignore_group_on_search user option
#
require("dbconnect_mysqli.php");
@@ -180,14 +181,15 @@ if ( $modify_leads < 1 )
exit;
}
-$stmt="SELECT full_name,modify_leads,admin_hide_lead_data,admin_hide_phone_data,user_group from vicidial_users where user='$PHP_AUTH_USER';";
+$stmt="SELECT full_name,modify_leads,admin_hide_lead_data,admin_hide_phone_data,user_group,ignore_group_on_search from vicidial_users where user='$PHP_AUTH_USER';";
$rslt=mysql_to_mysqli($stmt, $link);
$row=mysqli_fetch_row($rslt);
-$LOGfullname = $row[0];
-$LOGmodify_leads = $row[1];
-$LOGadmin_hide_lead_data = $row[2];
-$LOGadmin_hide_phone_data = $row[3];
-$LOGuser_group = $row[4];
+$LOGfullname = $row[0];
+$LOGmodify_leads = $row[1];
+$LOGadmin_hide_lead_data = $row[2];
+$LOGadmin_hide_phone_data = $row[3];
+$LOGuser_group = $row[4];
+$LOGignore_group_on_search = $row[5];
$stmt="SELECT allowed_campaigns,allowed_reports,admin_viewable_groups,admin_viewable_call_times from vicidial_user_groups where user_group='$LOGuser_group';";
if ($DB) {echo "|$stmt|\n";}
@@ -203,7 +205,7 @@ $LOGallowed_campaignsSQL='';
$whereLOGallowed_campaignsSQL='';
$LOGallowed_listsSQL='';
$whereLOGallowed_listsSQL='';
-if (!preg_match('/\-ALL/i', $LOGallowed_campaigns))
+if ( (!preg_match('/\-ALL/i', $LOGallowed_campaigns)) and ($LOGignore_group_on_search != '1') )
{
$rawLOGallowed_campaignsSQL = preg_replace("/ -/",'',$LOGallowed_campaigns);
$rawLOGallowed_campaignsSQL = preg_replace("/ /","','",$rawLOGallowed_campaignsSQL);
@@ -232,8 +234,8 @@ $regexLOGallowed_campaigns = " $LOGallowed_campaigns ";
-ADMINISTRATION: Lead Search
-<?php
+<title>
+<?php echo _QXZ("ADMINISTRATION: Lead Search");
##### BEGIN Set variables to make header show properly #####
$ADD = '100';
diff --git a/agc_2-X/trunk/www/vicidial/call_report_export.php b/agc_2-X/trunk/www/vicidial/call_report_export.php
index 9721df0d..45da8f83 100644
--- a/agc_2-X/trunk/www/vicidial/call_report_export.php
+++ b/agc_2-X/trunk/www/vicidial/call_report_export.php
@@ -5,7 +5,7 @@
# and/or vicidial_closer_log information by status, list_id and date range.
# downloads to a flat text file that is tab delimited
#
-# Copyright (C) 2014 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
+# Copyright (C) 2015 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
#
# CHANGES
#
@@ -40,6 +40,7 @@
# 140108-0727 - Added webserver and hostname to report logging
# 141001-2200 - Finalized adding QXZ translation to all admin files
# 141230-1349 - Added code for on-the-fly language translations display
+# 150108-1110 - Fixed issue with inbound and no outbound calls export
#
$startMS = microtime();
@@ -456,7 +457,7 @@ if ($run_export > 0)
$rslt=mysql_to_mysqli($stmt, $link);
if ($DB) {echo "$stmt\n";}
$outbound_to_print = mysqli_num_rows($rslt);
- if ($outbound_to_print < 1)
+ if ( ($outbound_to_print < 1) and ($RUNgroup < 1) )
{
echo _QXZ("There are no outbound calls during this time period for these parameters")."\n";
exit;
diff --git a/agc_2-X/trunk/www/vicidial/help.php b/agc_2-X/trunk/www/vicidial/help.php
index 5bd131a4..c056da17 100644
--- a/agc_2-X/trunk/www/vicidial/help.php
+++ b/agc_2-X/trunk/www/vicidial/help.php
@@ -1,7 +1,7 @@
<?php
# help.php - VICIDIAL administration page
#
-# Copyright (C) 2014 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
+# Copyright (C) 2015 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
#
# CHANGELOG:
@@ -32,6 +32,7 @@
# 141211-1647 - Added cpd_unknown_action and lists-na_call_url
# 141212-0945 - Added user_choose_language, selected_language and language_method
# 141230-1503 - Added code for on-the-fly language translations display
+# 150107-1954 - Added users-ignore_group_on_search
#
require("dbconnect_mysqli.php");
@@ -622,6 +623,11 @@ if ($SSqc_features_active > 0)
<BR>
<B><?php echo _QXZ("Admin Hide Phone Data"); ?> -</B><?php echo _QXZ("This setting only applies to level 7, 8 and 9 users. If enabled it replaces the customer phone numbers in the many reports and screens in the system with Xs. The DIGITS settings will show only the last X digits of the phone number. Default is 0 for disabled."); ?>
+<BR>
+<A NAME="users-ignore_group_on_search">
+<BR>
+<B><?php echo _QXZ("Search Lead Ignore Group Restrictions"); ?> -</B><?php echo _QXZ("Changing this setting to 1 will allow this user to search for leads throughout the entire system instead of just within the allowed campaigns that are set within their User Group. This will also allow modifying of those leads in the administrative lead modification page. Default is 0 for disabled. To be able to modify this setting, you must belong to a user group that has ALL CAMPAIGNS selected in the Allowed Campaigns section."); ?>
+