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 c19db1a7..34dfdcbb 100644 --- a/agc_2-X/trunk/www/vicidial/call_report_export.php +++ b/agc_2-X/trunk/www/vicidial/call_report_export.php @@ -55,6 +55,7 @@ # 170409-1547 - Added IP List validation code # 180418-1555 - Fix for missing call notes on inbound calls # 190116-2116 - Added ---ALL--- options for Campaigns and In-Groups +# 190610-2035 - Fixed admin hide phone issue # $startMS = microtime(); @@ -592,16 +593,29 @@ if ($run_export > 0) { if ($DB > 0) {$DBout .= "HIDEPHONEDATA|$row[1]|$LOGadmin_hide_phone_data|\n";} $phone_temp = $row[1]; - if (strlen($phone_temp) > 0) + $phone_lead_temp = $row[11]; + if ( (strlen($phone_temp) > 0) or (strlen($phone_lead_temp) > 0) ) { if ($LOGadmin_hide_phone_data == '4_DIGITS') - {$row[1] = str_repeat("X", (strlen($phone_temp) - 4)) . substr($phone_temp,-4,4);} + { + $row[1] = str_repeat("X", (strlen($phone_temp) - 4)) . substr($phone_temp,-4,4); + $row[11] = str_repeat("X", (strlen($phone_lead_temp) - 4)) . substr($phone_lead_temp,-4,4); + } elseif ($LOGadmin_hide_phone_data == '3_DIGITS') - {$row[1] = str_repeat("X", (strlen($phone_temp) - 3)) . substr($phone_temp,-3,3);} + { + $row[1] = str_repeat("X", (strlen($phone_temp) - 3)) . substr($phone_temp,-3,3); + $row[11] = str_repeat("X", (strlen($phone_lead_temp) - 3)) . substr($phone_lead_temp,-3,3); + } elseif ($LOGadmin_hide_phone_data == '2_DIGITS') - {$row[1] = str_repeat("X", (strlen($phone_temp) - 2)) . substr($phone_temp,-2,2);} + { + $row[1] = str_repeat("X", (strlen($phone_temp) - 2)) . substr($phone_temp,-2,2); + $row[11] = str_repeat("X", (strlen($phone_lead_temp) - 2)) . substr($phone_lead_temp,-2,2); + } else - {$row[1] = preg_replace("/./",'X',$phone_temp);} + { + $row[1] = preg_replace("/./",'X',$phone_temp); + $row[11] = preg_replace("/./",'X',$phone_lead_temp); + } } } if ($LOGadmin_hide_lead_data != '0') @@ -642,9 +656,10 @@ if ($run_export > 0) } ### PARSE TAB CHARACTERS FROM THE DATA ITSELF - for ($t=0; $t 0) { if ($DB > 0) {$DBout .= "HIDEPHONEDATA|$row[1]|$LOGadmin_hide_phone_data|\n";} $phone_temp = $row[1]; - if (strlen($phone_temp) > 0) + $phone_lead_temp = $row[11]; + if ( (strlen($phone_temp) > 0) or (strlen($phone_lead_temp) > 0) ) { if ($LOGadmin_hide_phone_data == '4_DIGITS') - {$row[1] = str_repeat("X", (strlen($phone_temp) - 4)) . substr($phone_temp,-4,4);} + { + $row[1] = str_repeat("X", (strlen($phone_temp) - 4)) . substr($phone_temp,-4,4); + $row[11] = str_repeat("X", (strlen($phone_lead_temp) - 4)) . substr($phone_lead_temp,-4,4); + } elseif ($LOGadmin_hide_phone_data == '3_DIGITS') - {$row[1] = str_repeat("X", (strlen($phone_temp) - 3)) . substr($phone_temp,-3,3);} + { + $row[1] = str_repeat("X", (strlen($phone_temp) - 3)) . substr($phone_temp,-3,3); + $row[11] = str_repeat("X", (strlen($phone_lead_temp) - 3)) . substr($phone_lead_temp,-3,3); + } elseif ($LOGadmin_hide_phone_data == '2_DIGITS') - {$row[1] = str_repeat("X", (strlen($phone_temp) - 2)) . substr($phone_temp,-2,2);} + { + $row[1] = str_repeat("X", (strlen($phone_temp) - 2)) . substr($phone_temp,-2,2); + $row[11] = str_repeat("X", (strlen($phone_lead_temp) - 2)) . substr($phone_lead_temp,-2,2); + } else - {$row[1] = preg_replace("/./",'X',$phone_temp);} + { + $row[1] = preg_replace("/./",'X',$phone_temp); + $row[11] = preg_replace("/./",'X',$phone_lead_temp); + } } } if ($LOGadmin_hide_lead_data != '0') diff --git a/agc_2-X/trunk/www/vicidial/call_report_export_carrier.php b/agc_2-X/trunk/www/vicidial/call_report_export_carrier.php index 3f7b8f7f..9ed67e4d 100644 --- a/agc_2-X/trunk/www/vicidial/call_report_export_carrier.php +++ b/agc_2-X/trunk/www/vicidial/call_report_export_carrier.php @@ -6,7 +6,7 @@ # downloads to a flat text file that is tab delimited. This version also # attempts to link carrier and dial log entries to those calls. # -# Copyright (C) 2017 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2019 Matt Florell LICENSE: AGPLv2 # # CHANGES # @@ -18,6 +18,7 @@ # 150909-0748 - Fixed issues with translated select list values, issue #885 # 160510-2100 - Added coding to remove tab characters from the data # 170409-1542 - Added IP List validation code +# 190610-2037 - Fixed admin hide phone issue # $startMS = microtime(); @@ -505,16 +506,29 @@ if ($run_export > 0) { if ($DB > 0) {echo "HIDEPHONEDATA|$row[1]|$LOGadmin_hide_phone_data|\n";} $phone_temp = $row[1]; - if (strlen($phone_temp) > 0) + $phone_lead_temp = $row[10]; + if ( (strlen($phone_temp) > 0) or (strlen($phone_lead_temp) > 0) ) { if ($LOGadmin_hide_phone_data == '4_DIGITS') - {$row[1] = str_repeat("X", (strlen($phone_temp) - 4)) . substr($phone_temp,-4,4);} + { + $row[1] = str_repeat("X", (strlen($phone_temp) - 4)) . substr($phone_temp,-4,4); + $row[10] = str_repeat("X", (strlen($phone_lead_temp) - 4)) . substr($phone_lead_temp,-4,4); + } elseif ($LOGadmin_hide_phone_data == '3_DIGITS') - {$row[1] = str_repeat("X", (strlen($phone_temp) - 3)) . substr($phone_temp,-3,3);} + { + $row[1] = str_repeat("X", (strlen($phone_temp) - 3)) . substr($phone_temp,-3,3); + $row[10] = str_repeat("X", (strlen($phone_lead_temp) - 3)) . substr($phone_lead_temp,-3,3); + } elseif ($LOGadmin_hide_phone_data == '2_DIGITS') - {$row[1] = str_repeat("X", (strlen($phone_temp) - 2)) . substr($phone_temp,-2,2);} + { + $row[1] = str_repeat("X", (strlen($phone_temp) - 2)) . substr($phone_temp,-2,2); + $row[10] = str_repeat("X", (strlen($phone_lead_temp) - 2)) . substr($phone_lead_temp,-2,2); + } else - {$row[1] = preg_replace("/./",'X',$phone_temp);} + { + $row[1] = preg_replace("/./",'X',$phone_temp); + $row[10] = preg_replace("/./",'X',$phone_lead_temp); + } } } if ($LOGadmin_hide_lead_data != '0') @@ -633,16 +647,29 @@ if ($run_export > 0) { if ($DB > 0) {echo "HIDEPHONEDATA|$row[1]|$LOGadmin_hide_phone_data|\n";} $phone_temp = $row[1]; - if (strlen($phone_temp) > 0) + $phone_lead_temp = $row[10]; + if ( (strlen($phone_temp) > 0) or (strlen($phone_lead_temp) > 0) ) { if ($LOGadmin_hide_phone_data == '4_DIGITS') - {$row[1] = str_repeat("X", (strlen($phone_temp) - 4)) . substr($phone_temp,-4,4);} + { + $row[1] = str_repeat("X", (strlen($phone_temp) - 4)) . substr($phone_temp,-4,4); + $row[10] = str_repeat("X", (strlen($phone_lead_temp) - 4)) . substr($phone_lead_temp,-4,4); + } elseif ($LOGadmin_hide_phone_data == '3_DIGITS') - {$row[1] = str_repeat("X", (strlen($phone_temp) - 3)) . substr($phone_temp,-3,3);} + { + $row[1] = str_repeat("X", (strlen($phone_temp) - 3)) . substr($phone_temp,-3,3); + $row[10] = str_repeat("X", (strlen($phone_lead_temp) - 3)) . substr($phone_lead_temp,-3,3); + } elseif ($LOGadmin_hide_phone_data == '2_DIGITS') - {$row[1] = str_repeat("X", (strlen($phone_temp) - 2)) . substr($phone_temp,-2,2);} + { + $row[1] = str_repeat("X", (strlen($phone_temp) - 2)) . substr($phone_temp,-2,2); + $row[10] = str_repeat("X", (strlen($phone_lead_temp) - 2)) . substr($phone_lead_temp,-2,2); + } else - {$row[1] = preg_replace("/./",'X',$phone_temp);} + { + $row[1] = preg_replace("/./",'X',$phone_temp); + $row[10] = preg_replace("/./",'X',$phone_lead_temp); + } } } if ($LOGadmin_hide_lead_data != '0') diff --git a/agc_2-X/trunk/www/vicidial/lead_report_export.php b/agc_2-X/trunk/www/vicidial/lead_report_export.php index fc32b1cf..264758e9 100644 --- a/agc_2-X/trunk/www/vicidial/lead_report_export.php +++ b/agc_2-X/trunk/www/vicidial/lead_report_export.php @@ -5,7 +5,7 @@ # vicidial_log 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) 2018 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2019 Matt Florell LICENSE: AGPLv2 # # CHANGES # @@ -32,6 +32,7 @@ # 180109-2005 - Added vendor lead code filtering option # 180422-0923 - Fix for missing header row in translated language, issue #1090 # 180610-1634 - Added option to allow --ALL-- as a campaign value +# 190610-2036 - Fixed admin hide phone issue # $startMS = microtime(); @@ -600,16 +601,29 @@ if ($run_export > 0) { if ($DB > 0) {echo "HIDEPHONEDATA|$row[1]|$LOGadmin_hide_phone_data|\n";} $phone_temp = $row[1]; - if (strlen($phone_temp) > 0) + $phone_lead_temp = $row[11]; + if ( (strlen($phone_temp) > 0) or (strlen($phone_lead_temp) > 0) ) { if ($LOGadmin_hide_phone_data == '4_DIGITS') - {$row[1] = str_repeat("X", (strlen($phone_temp) - 4)) . substr($phone_temp,-4,4);} + { + $row[1] = str_repeat("X", (strlen($phone_temp) - 4)) . substr($phone_temp,-4,4); + $row[11] = str_repeat("X", (strlen($phone_lead_temp) - 4)) . substr($phone_lead_temp,-4,4); + } elseif ($LOGadmin_hide_phone_data == '3_DIGITS') - {$row[1] = str_repeat("X", (strlen($phone_temp) - 3)) . substr($phone_temp,-3,3);} + { + $row[1] = str_repeat("X", (strlen($phone_temp) - 3)) . substr($phone_temp,-3,3); + $row[11] = str_repeat("X", (strlen($phone_lead_temp) - 3)) . substr($phone_lead_temp,-3,3); + } elseif ($LOGadmin_hide_phone_data == '2_DIGITS') - {$row[1] = str_repeat("X", (strlen($phone_temp) - 2)) . substr($phone_temp,-2,2);} + { + $row[1] = str_repeat("X", (strlen($phone_temp) - 2)) . substr($phone_temp,-2,2); + $row[11] = str_repeat("X", (strlen($phone_lead_temp) - 2)) . substr($phone_lead_temp,-2,2); + } else - {$row[1] = preg_replace("/./",'X',$phone_temp);} + { + $row[1] = preg_replace("/./",'X',$phone_temp); + $row[11] = preg_replace("/./",'X',$phone_lead_temp); + } } } if ($LOGadmin_hide_lead_data != '0') @@ -717,16 +731,29 @@ if ($run_export > 0) { if ($DB > 0) {echo "HIDEPHONEDATA|$row[1]|$LOGadmin_hide_phone_data|\n";} $phone_temp = $row[1]; - if (strlen($phone_temp) > 0) + $phone_lead_temp = $row[11]; + if ( (strlen($phone_temp) > 0) or (strlen($phone_lead_temp) > 0) ) { if ($LOGadmin_hide_phone_data == '4_DIGITS') - {$row[1] = str_repeat("X", (strlen($phone_temp) - 4)) . substr($phone_temp,-4,4);} + { + $row[1] = str_repeat("X", (strlen($phone_temp) - 4)) . substr($phone_temp,-4,4); + $row[11] = str_repeat("X", (strlen($phone_lead_temp) - 4)) . substr($phone_lead_temp,-4,4); + } elseif ($LOGadmin_hide_phone_data == '3_DIGITS') - {$row[1] = str_repeat("X", (strlen($phone_temp) - 3)) . substr($phone_temp,-3,3);} + { + $row[1] = str_repeat("X", (strlen($phone_temp) - 3)) . substr($phone_temp,-3,3); + $row[11] = str_repeat("X", (strlen($phone_lead_temp) - 3)) . substr($phone_lead_temp,-3,3); + } elseif ($LOGadmin_hide_phone_data == '2_DIGITS') - {$row[1] = str_repeat("X", (strlen($phone_temp) - 2)) . substr($phone_temp,-2,2);} + { + $row[1] = str_repeat("X", (strlen($phone_temp) - 2)) . substr($phone_temp,-2,2); + $row[11] = str_repeat("X", (strlen($phone_lead_temp) - 2)) . substr($phone_lead_temp,-2,2); + } else - {$row[1] = preg_replace("/./",'X',$phone_temp);} + { + $row[1] = preg_replace("/./",'X',$phone_temp); + $row[11] = preg_replace("/./",'X',$phone_lead_temp); + } } } if ($LOGadmin_hide_lead_data != '0')