diff --git a/bin/AST_email_web_report.pl b/bin/AST_email_web_report.pl index 222c87bd..cb6e6409 100644 --- a/bin/AST_email_web_report.pl +++ b/bin/AST_email_web_report.pl @@ -20,6 +20,7 @@ # 170304-1400 - Added options for running a defined Automated Report, and admin logging # 170306-0915 - Fixed proper file extensions for different download report types # 170719-1242 - Added more debug and '8days' date option +# 170825-1114 - Added report filename_override option # $txt = '.txt'; @@ -42,7 +43,7 @@ if ($min < 10) {$min = "0$min";} if ($sec < 10) {$sec = "0$sec";} $timestamp = "$year-$mon-$mday $hour:$min:$sec"; $filedate = "$year$mon$mday"; -$ABIfiledate = "$mon-$mday-$year$us$hour$min$sec"; +$filedatetime = "$year$mon$mday$hour$min$sec"; $shipdate = "$year-$mon-$mday"; $start_date = "$year$mon$mday"; $datestamp = "$year/$mon/$mday $hour:$min"; @@ -464,7 +465,7 @@ if ( (length($report_id) > 1) || ($log_to_adminlog > 0) ) if (length($report_id) > 1) { ### Grab Server values from the database - $stmtA = "SELECT report_destination,email_from,email_to,email_subject,ftp_server,ftp_user,ftp_pass,ftp_directory,report_url from vicidial_automated_reports where report_id='$report_id';"; + $stmtA = "SELECT report_destination,email_from,email_to,email_subject,ftp_server,ftp_user,ftp_pass,ftp_directory,report_url,filename_override from vicidial_automated_reports where report_id='$report_id';"; $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; $sthArows=$sthA->rows; @@ -488,6 +489,7 @@ if (length($report_id) > 1) $VARREPORT_dir = $aryA[7]; } $location = $aryA[8]; + $filename_override = $aryA[9]; if ($DB) {print "RAW LOCATION: |$location|\n";} $location =~ s/\&/\\&/gi; $location =~ s/--A--today--B--/$year-$mon-$mday/gi; @@ -499,7 +501,19 @@ if (length($report_id) > 1) $location =~ s/--A--14days--B--/$Kyear-$Kmon-$Kmday/gi; $location =~ s/--A--15days--B--/$Lyear-$Lmon-$Lmday/gi; $location =~ s/--A--30days--B--/$Hyear-$Hmon-$Hmday/gi; - if ($DB) {print "FINAL LOCATION: |$location|\n";} + $filename_override =~ s/[^-_0-9a-zA-Z]//gi; + $filename_override =~ s/--A--today--B--/$year-$mon-$mday/gi; + $filename_override =~ s/--A--yesterday--B--/$Tyear-$Tmon-$Tmday/gi; + $filename_override =~ s/--A--6days--B--/$Fyear-$Fmon-$Fmday/gi; + $filename_override =~ s/--A--7days--B--/$Gyear-$Gmon-$Gmday/gi; + $filename_override =~ s/--A--8days--B--/$Myear-$Mmon-$Mmday/gi; + $filename_override =~ s/--A--13days--B--/$Jyear-$Jmon-$Jmday/gi; + $filename_override =~ s/--A--14days--B--/$Kyear-$Kmon-$Kmday/gi; + $filename_override =~ s/--A--15days--B--/$Lyear-$Lmon-$Lmday/gi; + $filename_override =~ s/--A--30days--B--/$Hyear-$Hmon-$Hmday/gi; + $filename_override =~ s/--A--filedatetime--B--/$filedatetime/gi; + if ($DB) {print "FINAL LOCATION: |$location|\n";} + if ($DB) {print "FILENAME OVERRIDE: |$filename_override|\n";} } else { @@ -552,6 +566,8 @@ if (length($report_id) > 1) {$file_extension = '.csv'} } $HTMLfile = $report_id . "_" . $start_date . "_" . $hms . '' . $file_extension; + if (length($filename_override) > 0) + {$HTMLfile = "$filename_override$file_extension";} $HTMLfileLOG = $report_id . "_" . $start_date . "_" . $hms . '' . $txt; $shipdate=''; } @@ -672,7 +688,7 @@ if (length($VARREPORT_host) > 7) use Net::FTP; if (!$Q) {print "Sending File Over FTP: $HTMLfile\n";} - $ftp = Net::FTP->new("$VARREPORT_host", Port => $VARREPORT_port); + $ftp = Net::FTP->new("$VARREPORT_host", Port => $VARREPORT_port, Debug => $DBX); $ftp->login("$VARREPORT_user","$VARREPORT_pass"); $ftp->cwd("$VARREPORT_dir"); $ftp->put("/tmp/$HTMLfile", "$HTMLfile"); diff --git a/extras/MySQL_AST_CREATE_tables.sql b/extras/MySQL_AST_CREATE_tables.sql index 3687cfd9..31d08f2d 100644 --- a/extras/MySQL_AST_CREATE_tables.sql +++ b/extras/MySQL_AST_CREATE_tables.sql @@ -3650,7 +3650,7 @@ report_name VARCHAR(100), report_last_run DATETIME, report_last_length SMALLINT(5) default '0', report_server VARCHAR(30) default 'active_voicemail_server', -report_times VARCHAR(100) default '', +report_times VARCHAR(255) default '', report_weekdays VARCHAR(7) default '', report_monthdays VARCHAR(100) default '', report_destination ENUM('EMAIL','FTP') default 'EMAIL', @@ -3665,6 +3665,7 @@ report_url TEXT, run_now_trigger ENUM('N','Y') default 'N', active ENUM('N','Y') default 'N', user_group VARCHAR(20) default '---ALL---', +filename_override VARCHAR(255) default '', index (report_times), index (run_now_trigger) ) ENGINE=MyISAM; @@ -4064,4 +4065,4 @@ UPDATE vicidial_configuration set value='1766' where name='qc_database_version'; UPDATE system_settings set vdc_agent_api_active='1'; -UPDATE system_settings SET db_schema_version='1513',db_schema_update_date=NOW(),reload_timestamp=NOW(); +UPDATE system_settings SET db_schema_version='1514',db_schema_update_date=NOW(),reload_timestamp=NOW(); diff --git a/extras/upgrade_2.14.sql b/extras/upgrade_2.14.sql index 1b7ca00c..215adf75 100644 --- a/extras/upgrade_2.14.sql +++ b/extras/upgrade_2.14.sql @@ -355,3 +355,8 @@ UPDATE system_settings SET db_schema_version='1512',db_schema_update_date=NOW() ALTER TABLE system_settings ADD allow_manage_active_lists ENUM('0','1') default '0'; UPDATE system_settings SET db_schema_version='1513',db_schema_update_date=NOW() where db_schema_version < 1513; + +ALTER TABLE vicidial_automated_reports ADD filename_override VARCHAR(255) default ''; +ALTER TABLE vicidial_automated_reports MODIFY report_times VARCHAR(255) default ''; + +UPDATE system_settings SET db_schema_version='1514',db_schema_update_date=NOW() where db_schema_version < 1514; diff --git a/www/vicidial/AST_API_log_report.php b/www/vicidial/AST_API_log_report.php index 1010aa5a..3412a2cd 100644 --- a/www/vicidial/AST_API_log_report.php +++ b/www/vicidial/AST_API_log_report.php @@ -11,6 +11,7 @@ # 170209-1237 - Added URL and IP display # 170210-0700 - Reworked Show URLs code to be faster # 170409-1553 - Added IP List validation code +# 170823-2241 - Added HTML formatting and screen colors, fixed CSV output bug # $startMS = microtime(); @@ -493,6 +494,44 @@ while ($row=mysqli_fetch_array($rslt)) { array_push($results_array, $row["result"]); } +##### BEGIN Define colors and logo ##### +$SSmenu_background='015B91'; +$SSframe_background='D9E6FE'; +$SSstd_row1_background='9BB9FB'; +$SSstd_row2_background='B9CBFD'; +$SSstd_row3_background='8EBCFD'; +$SSstd_row4_background='B6D3FC'; +$SSstd_row5_background='FFFFFF'; +$SSalt_row1_background='BDFFBD'; +$SSalt_row2_background='99FF99'; +$SSalt_row3_background='CCFFCC'; + +$screen_color_stmt="select admin_screen_colors from system_settings"; +$screen_color_rslt=mysql_to_mysqli($screen_color_stmt, $link); +$screen_color_row=mysqli_fetch_row($screen_color_rslt); +$agent_screen_colors="$screen_color_row[0]"; + +if ($agent_screen_colors != 'default') + { + $asc_stmt = "SELECT menu_background,frame_background,std_row1_background,std_row2_background,std_row3_background,std_row4_background,std_row5_background,alt_row1_background,alt_row2_background,alt_row3_background,web_logo FROM vicidial_screen_colors where colors_id='$agent_screen_colors';"; + $asc_rslt=mysql_to_mysqli($asc_stmt, $link); + $qm_conf_ct = mysqli_num_rows($asc_rslt); + if ($qm_conf_ct > 0) + { + $asc_row=mysqli_fetch_row($asc_rslt); + $SSmenu_background = $asc_row[0]; + $SSframe_background = $asc_row[1]; + $SSstd_row1_background = $asc_row[2]; + $SSstd_row2_background = $asc_row[3]; + $SSstd_row3_background = $asc_row[4]; + $SSstd_row4_background = $asc_row[5]; + $SSstd_row5_background = $asc_row[6]; + $SSalt_row1_background = $asc_row[7]; + $SSalt_row2_background = $asc_row[8]; + $SSalt_row3_background = $asc_row[9]; + $SSweb_logo = $asc_row[10]; + } + } if ($DB) {echo "$user_group_string|$user_group_ct|$user_groupQS|$i
\n";} @@ -626,7 +665,11 @@ for ($o=0; $o"; +$HTML_text.="\n

"; $HTML_text.="\n"; $HTML_text.="

"._QXZ("Show URLs, slower")."\n"; if ($archives_available=="Y") @@ -638,7 +681,7 @@ $HTML_text.=""; $HTML_text.=""; $HTML_text.="\n\n"; -$HTML_text.="
\n";
+$TEXT.="
\n";
 
 if ($SUBMIT && $api_date_D && $api_date_T && $api_date_end_D && $api_date_end_T) 
 	{
@@ -653,23 +696,45 @@ if ($SUBMIT && $api_date_D && $api_date_T && $api_date_end_D && $api_date_end_T)
 		$ASCII_border="+---------------------+--------------------------------+------------+----------------------+--------------------------------+------------+----------------------+----------+-----------+-----------+----------------------+----------\n";
 		$URL_header="  REMOTE IP           |    URL";
 		}
-	$HTML_text.=$ASCII_rpt_header;
-	$HTML_text.=sprintf("%110s", " ");
-	$HTML_text.=""._QXZ("DOWNLOAD")."\n";
 
-	$HTML_text.=$ASCII_border;
-	$HTML_text.="| API DATE            | USER                           | API SCRIPT | FUNCTION             | AGENT USER                     | RESULT     | SOURCE               | RUN TIME | WEBSERVER | API URL   |$URL_header\n";
-	$HTML_text.=$ASCII_border;
+	$TEXT.=$ASCII_rpt_header;
+	$TEXT.=sprintf("%110s", " ");
+	$TEXT.=""._QXZ("DOWNLOAD")."\n";
+	$TEXT.=$ASCII_border;
+	$TEXT.="| API DATE            | USER                           | API SCRIPT | FUNCTION             | AGENT USER                     | RESULT     | SOURCE               | RUN TIME | WEBSERVER | API URL   |$URL_header\n";
+	$TEXT.=$ASCII_border;
+
+	$HTML.="
"; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.="\n"; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + if ($show_urls) { $CSV_text.="\n\"API DATE\",\"USER\",\"API SCRIPT\",\"FUNCTION\",\"AGENT USER\",\"VALUE\",\"RESULT\",\"RESULT REASON\",\"SOURCE\",\"DATA\",\"RUN TIME\",\"WEBSERVER\",\"API URL\",\"REMOTE IP\",\"FULL URL STRING\"\n"; + $HTML.=""; + $HTML.=""; } else { $CSV_text.="\n\"API DATE\",\"USER\",\"API SCRIPT\",\"FUNCTION\",\"AGENT USER\",\"VALUE\",\"RESULT\",\"RESULT REASON\",\"SOURCE\",\"DATA\",\"RUN TIME\",\"WEBSERVER\",\"API URL\"\n"; } + $HTML.="\n"; + $rslt=mysql_to_mysqli($stmt, $link); $g=0; while ($row=mysqli_fetch_array($rslt)) @@ -694,17 +759,30 @@ if ($SUBMIT && $api_date_D && $api_date_T && $api_date_end_D && $api_date_end_T) $h=0; while ($h < $g) { - $HTML_text.="| "; - $HTML_text.=sprintf("%-19s", $api_date[$h])." | "; - $HTML_text.=sprintf("%-30s", $full_user[$h])." | "; - $HTML_text.=sprintf("%-10s", $api_script[$h])." | "; - $HTML_text.=sprintf("%-20s", $function[$h])." | "; - $HTML_text.=sprintf("%-30s", $full_agent_user[$h])." | "; - $HTML_text.=sprintf("%-10s", $result[$h])." | "; - $HTML_text.=sprintf("%-20s", $source[$h])." | "; - $HTML_text.=sprintf("%-8s", $run_time[$h])." | "; - $HTML_text.=sprintf("%-9s", $webserver[$h])." | "; - $HTML_text.=sprintf("%-9s", $api_url[$h])." | "; + $TEXT.="| "; + $TEXT.=sprintf("%-19s", $api_date[$h])." | "; + $TEXT.=sprintf("%-30s", $full_user[$h])." | "; + $TEXT.=sprintf("%-10s", $api_script[$h])." | "; + $TEXT.=sprintf("%-20s", $function[$h])." | "; + $TEXT.=sprintf("%-30s", $full_agent_user[$h])." | "; + $TEXT.=sprintf("%-10s", $result[$h])." | "; + $TEXT.=sprintf("%-20s", $source[$h])." | "; + $TEXT.=sprintf("%-8s", $run_time[$h])." | "; + $TEXT.=sprintf("%-9s", $webserver[$h])." | "; + $TEXT.=sprintf("%-9s", $api_url[$h])." | "; + + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + if ($show_urls) { $stmt="select remote_ip,url from $vicidial_api_urls_table where api_id='$api_id[$h]';"; @@ -716,22 +794,35 @@ if ($SUBMIT && $api_date_D && $api_date_T && $api_date_end_D && $api_date_end_T) $remote_ip = $row["remote_ip"]; if ( ($VUmodify_same_user_level < 1) or ($VUuser_level < 9) or ($VUmodify_users < 1) ) {$full_url = preg_replace("/&pass=[\s\S]+?&/",'&pass=XXXX&',$full_url);} - $HTML_text.=sprintf("%-20s", $row["remote_ip"])." | "; - $HTML_text.=sprintf("%-2000s", $full_url)." | "; - $CSV_text.="\"$api_date[$h]\",\"$full_user[$h]\",\"$api_script[$h]\",\"$function[$h]\",\"$full_agent_user[$h]\",\"$value[$h]\",\"$result[$h]\",\"$result_reason[$h]\",\"$source[$h]\",\"$data[$h]\",\"$run_time[$h]\",\"$webserver[$h]\",\"$api_url[$h]\",\"$remote_ip\",\"$full_url\"\n"; + $TEXT.=sprintf("%-20s", $row["remote_ip"])." | "; + $TEXT.=sprintf("%-2000s", $full_url)." | "; } + $CSV_text.="\"$api_date[$h]\",\"$full_user[$h]\",\"$api_script[$h]\",\"$function[$h]\",\"$full_agent_user[$h]\",\"$value[$h]\",\"$result[$h]\",\"$result_reason[$h]\",\"$source[$h]\",\"$data[$h]\",\"$run_time[$h]\",\"$webserver[$h]\",\"$api_url[$h]\",\"$remote_ip\",\"$full_url\"\n"; + $HTML.=""; + $HTML.=""; } else { $CSV_text.="\"$api_date[$h]\",\"$full_user[$h]\",\"$api_script[$h]\",\"$function[$h]\",\"$full_agent_user[$h]\",\"$value[$h]\",\"$result[$h]\",\"$result_reason[$h]\",\"$source[$h]\",\"$data[$h]\",\"$run_time[$h]\",\"$webserver[$h]\",\"$api_url[$h]\"\n"; } - $HTML_text.="\n"; + $TEXT.="\n"; + $HTML.=""; $h++; } - $HTML_text.=$ASCII_border; + $TEXT.=$ASCII_border; + $HTML.="
$ASCII_rpt_header"._QXZ("DOWNLOAD")."
"._QXZ("API DATE").""._QXZ("USER").""._QXZ("API SCRIPT").""._QXZ("FUNCTION").""._QXZ("AGENT USER").""._QXZ("RESULT").""._QXZ("SOURCE").""._QXZ("RUN TIME").""._QXZ("WEBSERVER").""._QXZ("API URL").""._QXZ("REMOTE IP").""._QXZ("FULL URL STRING")."
".$api_date[$h]."".$full_user[$h]."".$api_script[$h]."".$function[$h]."".$full_agent_user[$h]."".$result[$h]."".$source[$h]."".$run_time[$h]."".$webserver[$h]."".$api_url[$h]."".($remote_ip=="" ? " " : $remote_ip)."".($full_url=="" ? " " : $full_url)."
"; } -$HTML_text.="
"; +$TEXT.="
"; + +if ($report_display_type=="HTML") { + $HTML_text.=$HTML; +} else { + $HTML_text.=$TEXT; +} + + +$HTML_text.=""; if ($file_download == 0 || !$file_download) diff --git a/www/vicidial/AST_CLOSERstats_v2.php b/www/vicidial/AST_CLOSERstats_v2.php index 919a1773..6a1a7ec6 100644 --- a/www/vicidial/AST_CLOSERstats_v2.php +++ b/www/vicidial/AST_CLOSERstats_v2.php @@ -421,6 +421,45 @@ while ($i < $statcats_to_print) $i++; } +##### BEGIN Define colors and logo ##### +$SSmenu_background='015B91'; +$SSframe_background='D9E6FE'; +$SSstd_row1_background='9BB9FB'; +$SSstd_row2_background='B9CBFD'; +$SSstd_row3_background='8EBCFD'; +$SSstd_row4_background='B6D3FC'; +$SSstd_row5_background='FFFFFF'; +$SSalt_row1_background='BDFFBD'; +$SSalt_row2_background='99FF99'; +$SSalt_row3_background='CCFFCC'; + +$screen_color_stmt="select admin_screen_colors from system_settings"; +$screen_color_rslt=mysql_to_mysqli($screen_color_stmt, $link); +$screen_color_row=mysqli_fetch_row($screen_color_rslt); +$agent_screen_colors="$screen_color_row[0]"; + +if ($agent_screen_colors != 'default') + { + $asc_stmt = "SELECT menu_background,frame_background,std_row1_background,std_row2_background,std_row3_background,std_row4_background,std_row5_background,alt_row1_background,alt_row2_background,alt_row3_background,web_logo FROM vicidial_screen_colors where colors_id='$agent_screen_colors';"; + $asc_rslt=mysql_to_mysqli($asc_stmt, $link); + $qm_conf_ct = mysqli_num_rows($asc_rslt); + if ($qm_conf_ct > 0) + { + $asc_row=mysqli_fetch_row($asc_rslt); + $SSmenu_background = $asc_row[0]; + $SSframe_background = $asc_row[1]; + $SSstd_row1_background = $asc_row[2]; + $SSstd_row2_background = $asc_row[3]; + $SSstd_row3_background = $asc_row[4]; + $SSstd_row4_background = $asc_row[5]; + $SSstd_row5_background = $asc_row[6]; + $SSalt_row1_background = $asc_row[7]; + $SSalt_row2_background = $asc_row[8]; + $SSalt_row3_background = $asc_row[9]; + $SSweb_logo = $asc_row[10]; + } + } + $NWB = "   \"HELP\""; @@ -466,7 +505,7 @@ if ($DB > 0) } $MAIN.="
\n"; -$MAIN.="
\n"; +$MAIN.="
\n"; $MAIN.="\n"; $MAIN.="\n"; $MAIN.="\n"; diff --git a/www/vicidial/AST_agent_days_detail.php b/www/vicidial/AST_agent_days_detail.php index 33822618..8d4ea64a 100644 --- a/www/vicidial/AST_agent_days_detail.php +++ b/www/vicidial/AST_agent_days_detail.php @@ -909,7 +909,7 @@ if ($report_display_type=='HTML') {$JS_text.=$JS_onload;} $JS_text.="\n"; echo ""; -echo "
"._QXZ("Dates").":
"; +echo "
"._QXZ("Dates").":
"; echo "\n"; echo ""; diff --git a/www/vicidial/AST_agent_performance_detail.php b/www/vicidial/AST_agent_performance_detail.php index 7637cc82..627e1451 100644 --- a/www/vicidial/AST_agent_performance_detail.php +++ b/www/vicidial/AST_agent_performance_detail.php @@ -474,6 +474,44 @@ else $user_SQL = "and vicidial_users.user IN($user_SQL)"; } +##### BEGIN Define colors and logo ##### +$SSmenu_background='015B91'; +$SSframe_background='D9E6FE'; +$SSstd_row1_background='9BB9FB'; +$SSstd_row2_background='B9CBFD'; +$SSstd_row3_background='8EBCFD'; +$SSstd_row4_background='B6D3FC'; +$SSstd_row5_background='FFFFFF'; +$SSalt_row1_background='BDFFBD'; +$SSalt_row2_background='99FF99'; +$SSalt_row3_background='CCFFCC'; + +$screen_color_stmt="select admin_screen_colors from system_settings"; +$screen_color_rslt=mysql_to_mysqli($screen_color_stmt, $link); +$screen_color_row=mysqli_fetch_row($screen_color_rslt); +$agent_screen_colors="$screen_color_row[0]"; + +if ($agent_screen_colors != 'default') + { + $asc_stmt = "SELECT menu_background,frame_background,std_row1_background,std_row2_background,std_row3_background,std_row4_background,std_row5_background,alt_row1_background,alt_row2_background,alt_row3_background,web_logo FROM vicidial_screen_colors where colors_id='$agent_screen_colors';"; + $asc_rslt=mysql_to_mysqli($asc_stmt, $link); + $qm_conf_ct = mysqli_num_rows($asc_rslt); + if ($qm_conf_ct > 0) + { + $asc_row=mysqli_fetch_row($asc_rslt); + $SSmenu_background = $asc_row[0]; + $SSframe_background = $asc_row[1]; + $SSstd_row1_background = $asc_row[2]; + $SSstd_row2_background = $asc_row[3]; + $SSstd_row3_background = $asc_row[4]; + $SSstd_row4_background = $asc_row[5]; + $SSstd_row5_background = $asc_row[6]; + $SSalt_row1_background = $asc_row[7]; + $SSalt_row2_background = $asc_row[8]; + $SSalt_row3_background = $asc_row[9]; + $SSweb_logo = $asc_row[10]; + } + } if ($DB) {$HTML_text.="$user_group_string|$user_group_ct|$user_groupQS|$i
";} @@ -512,7 +550,7 @@ $HTML_text.="
"; $HTML_text.=""._QXZ("$report_name")." $NWB#agent_performance_detail$NWE\n"; $HTML_text.="\n"; -$HTML_text.="
"._QXZ("Dates").":
"; +$HTML_text.="
"._QXZ("Dates").":
"; $HTML_text.="\n"; $HTML_text.=""; diff --git a/www/vicidial/AST_agent_status_detail.php b/www/vicidial/AST_agent_status_detail.php index 61805f3c..34bafdfb 100644 --- a/www/vicidial/AST_agent_status_detail.php +++ b/www/vicidial/AST_agent_status_detail.php @@ -410,6 +410,45 @@ if (strlen($customer_interactive_statuses)>0) #$customer_interactive_statuses = '|NI|DNC|CALLBK|AP|SALE|COMP|HAP1|HAP2|HBED|DIED|'; #$customer_interactive_statuses = '|NI|DNC|CALLBK|XFER|C2|B7|B8|C1|'; +##### BEGIN Define colors and logo ##### +$SSmenu_background='015B91'; +$SSframe_background='D9E6FE'; +$SSstd_row1_background='9BB9FB'; +$SSstd_row2_background='B9CBFD'; +$SSstd_row3_background='8EBCFD'; +$SSstd_row4_background='B6D3FC'; +$SSstd_row5_background='FFFFFF'; +$SSalt_row1_background='BDFFBD'; +$SSalt_row2_background='99FF99'; +$SSalt_row3_background='CCFFCC'; + +$screen_color_stmt="select admin_screen_colors from system_settings"; +$screen_color_rslt=mysql_to_mysqli($screen_color_stmt, $link); +$screen_color_row=mysqli_fetch_row($screen_color_rslt); +$agent_screen_colors="$screen_color_row[0]"; + +if ($agent_screen_colors != 'default') + { + $asc_stmt = "SELECT menu_background,frame_background,std_row1_background,std_row2_background,std_row3_background,std_row4_background,std_row5_background,alt_row1_background,alt_row2_background,alt_row3_background,web_logo FROM vicidial_screen_colors where colors_id='$agent_screen_colors';"; + $asc_rslt=mysql_to_mysqli($asc_stmt, $link); + $qm_conf_ct = mysqli_num_rows($asc_rslt); + if ($qm_conf_ct > 0) + { + $asc_row=mysqli_fetch_row($asc_rslt); + $SSmenu_background = $asc_row[0]; + $SSframe_background = $asc_row[1]; + $SSstd_row1_background = $asc_row[2]; + $SSstd_row2_background = $asc_row[3]; + $SSstd_row3_background = $asc_row[4]; + $SSstd_row4_background = $asc_row[5]; + $SSstd_row5_background = $asc_row[6]; + $SSalt_row1_background = $asc_row[7]; + $SSalt_row2_background = $asc_row[8]; + $SSalt_row3_background = $asc_row[9]; + $SSweb_logo = $asc_row[10]; + } + } + $LINKbase = "$PHP_SELF?query_date=$query_date&end_date=$end_date$groupQS$user_groupQS&shift=$shift&search_archived_data=$search_archived_data&show_defunct_users=$show_defunct_users&report_display_type=$report_display_type&DB=$DB"; $NWB = "   "; -echo "
Dates:
"; +echo "
Dates:
"; echo "\n"; echo ""; diff --git a/www/vicidial/AST_agent_time_detail.php b/www/vicidial/AST_agent_time_detail.php index 3ceef7dd..6d76dd07 100644 --- a/www/vicidial/AST_agent_time_detail.php +++ b/www/vicidial/AST_agent_time_detail.php @@ -469,6 +469,45 @@ $LINKbase = "$PHP_SELF?query_date=$query_date&end_date=$end_date$groupQS$user_gr $NWB = "   \"HELP\""; +##### BEGIN Define colors and logo ##### +$SSmenu_background='015B91'; +$SSframe_background='D9E6FE'; +$SSstd_row1_background='9BB9FB'; +$SSstd_row2_background='B9CBFD'; +$SSstd_row3_background='8EBCFD'; +$SSstd_row4_background='B6D3FC'; +$SSstd_row5_background='FFFFFF'; +$SSalt_row1_background='BDFFBD'; +$SSalt_row2_background='99FF99'; +$SSalt_row3_background='CCFFCC'; + +$screen_color_stmt="select admin_screen_colors from system_settings"; +$screen_color_rslt=mysql_to_mysqli($screen_color_stmt, $link); +$screen_color_row=mysqli_fetch_row($screen_color_rslt); +$agent_screen_colors="$screen_color_row[0]"; + +if ($agent_screen_colors != 'default') + { + $asc_stmt = "SELECT menu_background,frame_background,std_row1_background,std_row2_background,std_row3_background,std_row4_background,std_row5_background,alt_row1_background,alt_row2_background,alt_row3_background,web_logo FROM vicidial_screen_colors where colors_id='$agent_screen_colors';"; + $asc_rslt=mysql_to_mysqli($asc_stmt, $link); + $qm_conf_ct = mysqli_num_rows($asc_rslt); + if ($qm_conf_ct > 0) + { + $asc_row=mysqli_fetch_row($asc_rslt); + $SSmenu_background = $asc_row[0]; + $SSframe_background = $asc_row[1]; + $SSstd_row1_background = $asc_row[2]; + $SSstd_row2_background = $asc_row[3]; + $SSstd_row3_background = $asc_row[4]; + $SSstd_row4_background = $asc_row[5]; + $SSstd_row5_background = $asc_row[6]; + $SSalt_row1_background = $asc_row[7]; + $SSalt_row2_background = $asc_row[8]; + $SSalt_row3_background = $asc_row[9]; + $SSweb_logo = $asc_row[10]; + } + } + if ($file_download < 1) { ?> @@ -1451,7 +1490,7 @@ if ($report_display_type=='HTML') {$JS_text.=$JS_onload;} $JS_text.="\n"; echo ""; -echo "
"._QXZ("Dates").":
"; +echo "
"._QXZ("Dates").":
"; echo "\n"; echo ""; diff --git a/www/vicidial/AST_agent_timeclock_detail.php b/www/vicidial/AST_agent_timeclock_detail.php index 295bed24..99562389 100644 --- a/www/vicidial/AST_agent_timeclock_detail.php +++ b/www/vicidial/AST_agent_timeclock_detail.php @@ -367,6 +367,45 @@ while ($i < $statha_to_print) $i++; } +##### BEGIN Define colors and logo ##### +$SSmenu_background='015B91'; +$SSframe_background='D9E6FE'; +$SSstd_row1_background='9BB9FB'; +$SSstd_row2_background='B9CBFD'; +$SSstd_row3_background='8EBCFD'; +$SSstd_row4_background='B6D3FC'; +$SSstd_row5_background='FFFFFF'; +$SSalt_row1_background='BDFFBD'; +$SSalt_row2_background='99FF99'; +$SSalt_row3_background='CCFFCC'; + +$screen_color_stmt="select admin_screen_colors from system_settings"; +$screen_color_rslt=mysql_to_mysqli($screen_color_stmt, $link); +$screen_color_row=mysqli_fetch_row($screen_color_rslt); +$agent_screen_colors="$screen_color_row[0]"; + +if ($agent_screen_colors != 'default') + { + $asc_stmt = "SELECT menu_background,frame_background,std_row1_background,std_row2_background,std_row3_background,std_row4_background,std_row5_background,alt_row1_background,alt_row2_background,alt_row3_background,web_logo FROM vicidial_screen_colors where colors_id='$agent_screen_colors';"; + $asc_rslt=mysql_to_mysqli($asc_stmt, $link); + $qm_conf_ct = mysqli_num_rows($asc_rslt); + if ($qm_conf_ct > 0) + { + $asc_row=mysqli_fetch_row($asc_rslt); + $SSmenu_background = $asc_row[0]; + $SSframe_background = $asc_row[1]; + $SSstd_row1_background = $asc_row[2]; + $SSstd_row2_background = $asc_row[3]; + $SSstd_row3_background = $asc_row[4]; + $SSstd_row4_background = $asc_row[5]; + $SSstd_row5_background = $asc_row[6]; + $SSalt_row1_background = $asc_row[7]; + $SSalt_row2_background = $asc_row[8]; + $SSalt_row3_background = $asc_row[9]; + $SSweb_logo = $asc_row[10]; + } + } + $LINKbase = "$PHP_SELF?query_date=$query_dateURL&end_date=$end_dateURL$groupQS$user_groupQS&shift=$shift&DB=$DB"; $NWB = "  
"; echo ""._QXZ("$report_name")." $NWB#agent_timeclock_detail$NWE\n"; echo "\n"; - echo "
"._QXZ("Dates").":
"; + echo ""; } else { $carrier_rpt_hf.=sprintf("%-23s", " "); - $HTML.=""; } $carrier_rpt_hf.=sprintf("%-145s", " "); if (($lower_limit+1000)0) { $HTML.=""; } $carrier_rpt_hf.="\n"; $TEXT.=$carrier_rpt_hf.$carrier_rpt.$carrier_rpt_hf; diff --git a/www/vicidial/AST_email_log_report.php b/www/vicidial/AST_email_log_report.php index 78fd5b93..f0f45a00 100644 --- a/www/vicidial/AST_email_log_report.php +++ b/www/vicidial/AST_email_log_report.php @@ -345,6 +345,45 @@ else } if (strlen($group_SQL)<3) {$group_SQL="''";} +##### BEGIN Define colors and logo ##### +$SSmenu_background='015B91'; +$SSframe_background='D9E6FE'; +$SSstd_row1_background='9BB9FB'; +$SSstd_row2_background='B9CBFD'; +$SSstd_row3_background='8EBCFD'; +$SSstd_row4_background='B6D3FC'; +$SSstd_row5_background='FFFFFF'; +$SSalt_row1_background='BDFFBD'; +$SSalt_row2_background='99FF99'; +$SSalt_row3_background='CCFFCC'; + +$screen_color_stmt="select admin_screen_colors from system_settings"; +$screen_color_rslt=mysql_to_mysqli($screen_color_stmt, $link); +$screen_color_row=mysqli_fetch_row($screen_color_rslt); +$agent_screen_colors="$screen_color_row[0]"; + +if ($agent_screen_colors != 'default') + { + $asc_stmt = "SELECT menu_background,frame_background,std_row1_background,std_row2_background,std_row3_background,std_row4_background,std_row5_background,alt_row1_background,alt_row2_background,alt_row3_background,web_logo FROM vicidial_screen_colors where colors_id='$agent_screen_colors';"; + $asc_rslt=mysql_to_mysqli($asc_stmt, $link); + $qm_conf_ct = mysqli_num_rows($asc_rslt); + if ($qm_conf_ct > 0) + { + $asc_row=mysqli_fetch_row($asc_rslt); + $SSmenu_background = $asc_row[0]; + $SSframe_background = $asc_row[1]; + $SSstd_row1_background = $asc_row[2]; + $SSstd_row2_background = $asc_row[3]; + $SSstd_row3_background = $asc_row[4]; + $SSstd_row4_background = $asc_row[5]; + $SSstd_row5_background = $asc_row[6]; + $SSalt_row1_background = $asc_row[7]; + $SSalt_row2_background = $asc_row[8]; + $SSalt_row3_background = $asc_row[9]; + $SSweb_logo = $asc_row[10]; + } + } + $NWB = "   \"HELP\""; @@ -410,7 +449,7 @@ if ($DB > 0) } $MAIN.="\n"; -$MAIN.="
"._QXZ("Dates").":
"; echo "\n"; echo "\n"; echo "\n"; diff --git a/www/vicidial/AST_carrier_log_report.php b/www/vicidial/AST_carrier_log_report.php index 5aeb2968..ee2560f6 100644 --- a/www/vicidial/AST_carrier_log_report.php +++ b/www/vicidial/AST_carrier_log_report.php @@ -14,7 +14,7 @@ # 141114-0846 - Finalized adding QXZ translation to all admin files # 141230-1513 - Added code for on-the-fly language translations display # 170409-1534 - Added IP List validation code -# 170821-2219 - Added HTML formatting +# 170821-2219 - Added HTML formatting and screen colors # $startMS = microtime(); @@ -542,7 +542,7 @@ if ($SUBMIT && $server_ip_ct>0) { $HTML.="
[<<< "._QXZ("PREV")." 1000 "._QXZ("records")."] "; + $HTML.=" ["._QXZ("NEXT")." $max_limit "._QXZ("records")." >>>]"; } else { $carrier_rpt_hf.=sprintf("%23s", " "); - $HTML.=" "; + $HTML.=" 
\n"; +$MAIN.="
\n"; $MAIN.="\n"; $MAIN.=_QXZ("Date Range").":
\n"; $MAIN.=""; diff --git a/www/vicidial/AST_parkstats.php b/www/vicidial/AST_parkstats.php index 71b5e6fe..6af0401e 100644 --- a/www/vicidial/AST_parkstats.php +++ b/www/vicidial/AST_parkstats.php @@ -17,6 +17,7 @@ # 170409-1534 - Added IP List validation code # 170412-2129 - Updated for new park logging # 170808-0220 - Added detailed log option +# 170823-2154 - Added HTML formatting and screen colors # $startMS = microtime(); @@ -42,6 +43,8 @@ if (isset($_GET["submit"])) {$submit=$_GET["submit"];} elseif (isset($_POST["submit"])) {$submit=$_POST["submit"];} if (isset($_GET["SUBMIT"])) {$SUBMIT=$_GET["SUBMIT"];} elseif (isset($_POST["SUBMIT"])) {$SUBMIT=$_POST["SUBMIT"];} +if (isset($_GET["report_display_type"])) {$report_display_type=$_GET["report_display_type"];} + elseif (isset($_POST["report_display_type"])) {$report_display_type=$_POST["report_display_type"];} ############################################# ##### START SYSTEM_SETTINGS LOOKUP ##### @@ -254,59 +257,133 @@ while ($i < $groups_to_print) $groups[$i] =$row[0]; $i++; } -?> - - - -\n"; -echo ""._QXZ("Park Stats")."\n"; -echo "\n"; -echo "\n"; -echo "
"; +$MAIN.="\n"; +$MAIN.="
\n"; +$MAIN.="\n"; +$MAIN.=_QXZ("Date").":\n"; +$MAIN.=""; +$MAIN.="\n"; + +$MAIN.="\n"; +$MAIN.="\n"; -echo "Show details\n"; -echo "\n"; -echo "           "._QXZ("MODIFY")." | "._QXZ("REPORTS")." \n"; -echo "\n\n"; +$MAIN.="\n"; +$MAIN.=_QXZ("Display as:")." "; +$MAIN.=""; +$MAIN.="\n"; +$MAIN.="Show details\n"; +$MAIN.="\n"; +$MAIN.="\n"; +$MAIN.="           "._QXZ("MODIFY")." | "._QXZ("REPORTS")." \n"; +$MAIN.="
\n"; +$MAIN.="\n\n"; -echo "
\n\n";
+$TEXT.="
\n\n";
 
 
 if (!$group)
 {
-echo "\n\n";
-echo _QXZ("PLEASE SELECT A GROUP AND DATE ABOVE AND CLICK SUBMIT")."\n";
+$MAIN.="\n\n";
+$MAIN.=_QXZ("PLEASE SELECT A GROUP AND DATE ABOVE AND CLICK SUBMIT")."\n";
 }
 
 else
 {
 
 
-echo _QXZ("Park Stats",48)." $NOW_TIME\n";
+$TEXT.=_QXZ("Park Stats",48)." $NOW_TIME\n";
+$TEXT.="\n";
+$TEXT.="---------- "._QXZ("TOTALS")."\n";
 
-echo "\n";
-echo "---------- "._QXZ("TOTALS")."\n";
+$HTML.="
"; +$HTML.=""; +$HTML.=""; +$HTML.="\n"; $stmt="select count(*),sum(parked_sec) from park_log where parked_time >= '$query_date 00:00:01' and parked_time <= '$query_date 23:59:59' and status IN('HUNGUP','GRABBED','GRABBEDIVR','IVRPARKED','PARKED') and channel_group='" . mysqli_real_escape_string($link, $group) . "';"; $rslt=mysql_to_mysqli($stmt, $link); -if ($DB) {echo "$stmt\n";} +if ($DB) {$MAIN.="$stmt\n";} $row=mysqli_fetch_row($rslt); $TOTALcalls = sprintf("%10s", $row[0]); @@ -314,15 +391,21 @@ $average_hold_seconds = MathZDC($row[1], $row[0]); $average_hold_seconds = round($average_hold_seconds, 0); $average_hold_seconds = sprintf("%10s", $average_hold_seconds); -echo _QXZ("Total Calls parked in this Group:",45)." $TOTALcalls\n"; -echo _QXZ("Average Hold Time(seconds) for Parked Calls:",45)." $average_hold_seconds\n"; +$TEXT.=_QXZ("Total Calls parked in this Group:",45)." $TOTALcalls\n"; +$TEXT.=_QXZ("Average Hold Time(seconds) for Parked Calls:",45)." $average_hold_seconds\n"; +$TEXT.="\n"; +$TEXT.="---------- "._QXZ("DROPS")."\n"; -echo "\n"; -echo "---------- "._QXZ("DROPS")."\n"; +$HTML.=""; +$HTML.="
"._QXZ("Park Stats",48)." $NOW_TIME
"._QXZ("TOTALS")."
"; +$HTML.=_QXZ("Total Calls parked in this Group:")." $TOTALcalls
"; +$HTML.=_QXZ("Average Hold Time(seconds) for Parked Calls:")." $average_hold_seconds"; +$HTML.="

"; +$HTML.=""._QXZ("DROPS")."
"; $stmt="select count(*),sum(parked_sec) from park_log where parked_time >= '$query_date 00:00:01' and parked_time <= '$query_date 23:59:59' and status ='HUNGUP' and channel_group='" . mysqli_real_escape_string($link, $group) . "' and (talked_sec < 5 or talked_sec is null);"; $rslt=mysql_to_mysqli($stmt, $link); -if ($DB) {echo "$stmt\n";} +if ($DB) {$MAIN.="$stmt\n";} $row=mysqli_fetch_row($rslt); $DROPcalls = sprintf("%10s", $row[0]); @@ -333,22 +416,40 @@ $average_hold_seconds = MathZDC($row[1], $row[0]); $average_hold_seconds = round($average_hold_seconds, 0); $average_hold_seconds = sprintf("%10s", $average_hold_seconds); -echo _QXZ("Total Dropped Calls:",45)." $DROPcalls $DROPpercent%\n"; -echo _QXZ("Average Hold Time(seconds) for Dropped Calls:",45)." $average_hold_seconds\n"; +$TEXT.=_QXZ("Total Dropped Calls:",45)." $DROPcalls $DROPpercent%\n"; +$TEXT.=_QXZ("Average Hold Time(seconds) for Dropped Calls:",45)." $average_hold_seconds\n"; + +$HTML.=_QXZ("Total Dropped Calls:")." $DROPcalls $DROPpercent%
"; +$HTML.=_QXZ("Average Hold Time(seconds) for Dropped Calls:")." $average_hold_seconds"; +$HTML.="
"; ############################## ######### USER STATS -echo "\n"; -echo "---------- "._QXZ("USER PARK STATS").":\n"; -echo "+---------------------------------------------+------------+--------+--------+------------+--------+--------+\n"; -echo "| "._QXZ("USER",43)." | "._QXZ("CALLS",10)." | "._QXZ("TIME M",6)." | "._QXZ("AVRG M",6)." | "._QXZ("DROPS",10)." | "._QXZ("TIME M",6)." | "._QXZ("AVRG M",6)." |\n"; -echo "+---------------------------------------------+------------+--------+--------+------------+--------+--------+\n"; +$TEXT.="\n"; +$TEXT.="---------- "._QXZ("USER PARK STATS").":\n"; +$TEXT.="+---------------------------------------------+------------+--------+--------+------------+--------+--------+\n"; +$TEXT.="| "._QXZ("USER",43)." | "._QXZ("CALLS",10)." | "._QXZ("TIME M",6)." | "._QXZ("AVRG M",6)." | "._QXZ("DROPS",10)." | "._QXZ("TIME M",6)." | "._QXZ("AVRG M",6)." |\n"; +$TEXT.="+---------------------------------------------+------------+--------+--------+------------+--------+--------+\n"; + +$HTML.="
"; +$HTML.=""; +$HTML.=""; +$HTML.="\n"; +$HTML.=""; +$HTML.=""; +$HTML.=""; +$HTML.=""; +$HTML.=""; +$HTML.=""; +$HTML.=""; +$HTML.=""; +$HTML.="\n"; $stmt="select park_log.user,full_name,count(*),sum(parked_sec),avg(parked_sec) from park_log,vicidial_users where parked_time >= '$query_date 00:00:01' and parked_time <= '$query_date 23:59:59' and status IN('HUNGUP','GRABBED','GRABBEDIVR','IVRPARKED','PARKED') and channel_group='" . mysqli_real_escape_string($link, $group) . "' and parked_sec is not null and park_log.user is not null and park_log.user=vicidial_users.user group by park_log.user;"; $rslt=mysql_to_mysqli($stmt, $link); -if ($DB) {echo "$stmt\n";} +if ($DB) {$MAIN.="$stmt\n";} $users_to_print = mysqli_num_rows($rslt); $i=0; while ($i < $users_to_print) @@ -388,7 +489,7 @@ while ($i < $users_to_print) { $stmt="select count(*),sum(parked_sec),avg(parked_sec) from park_log where parked_time >= '$query_date 00:00:01' and parked_time <= '$query_date 23:59:59' and status IN('HUNGUP') and channel_group='" . mysqli_real_escape_string($link, $group) . "' and parked_sec is not null and park_log.user='$user[$i]' group by park_log.user;"; $rslt=mysql_to_mysqli($stmt, $link); - if ($DB) {echo "$stmt\n";} + if ($DB) {$MAIN.="$stmt\n";} $drop_to_print = mysqli_num_rows($rslt); if ($users_to_print > 0) { @@ -418,20 +519,38 @@ while ($i < $users_to_print) $USERavgDROP_MS[$i] = sprintf("%6s", $USERavgDROP_MS[$i]); } - echo "| $full_name[$i] | $USERcalls[$i] | $USERtotTALK_MS[$i] | $USERavgTALK_MS[$i] | $USERdrops[$i] | $USERtotDROP_MS[$i] | $USERavgDROP_MS[$i] |\n"; + $TEXT.="| $full_name[$i] | $USERcalls[$i] | $USERtotTALK_MS[$i] | $USERavgTALK_MS[$i] | $USERdrops[$i] | $USERtotDROP_MS[$i] | $USERavgDROP_MS[$i] |\n"; + + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.="\n"; $i++; } -echo "+---------------------------------------------+------------+--------+--------+------------+--------+--------+\n"; +$TEXT.="+---------------------------------------------+------------+--------+--------+------------+--------+--------+\n"; +$HTML.="
"._QXZ("USER PARK STATS")."
"._QXZ("USER").""._QXZ("CALLS").""._QXZ("TIME M").""._QXZ("AVRG M").""._QXZ("DROPS").""._QXZ("TIME M").""._QXZ("AVRG M")."
$full_name[$i]$USERcalls[$i]$USERtotTALK_MS[$i]$USERavgTALK_MS[$i]$USERdrops[$i]$USERtotDROP_MS[$i]$USERavgDROP_MS[$i]
\n"; ############################## ######### TIME STATS -echo "\n"; -echo "---------- "._QXZ("TIME STATS")."\n"; +$TEXT.="\n\n"; +$TEXT.="---------- "._QXZ("TIME STATS"); -echo "\n"; +$TEXT.=""; + +$HTML.="
"; +$HTML.=""; +$HTML.=""; +$HTML.=""; +$HTML.=""; +$HTML.="
"._QXZ("TIME STATS")."
";
 
 $hi_hour_count=0;
 $last_full_record=0;
@@ -441,14 +560,14 @@ while ($i <= 96)
 	{
 	$stmt="select count(*) from park_log where parked_time >= '$query_date $h:00:00' and parked_time <= '$query_date $h:14:59' and status IN('HUNGUP','GRABBED','GRABBEDIVR','IVRPARKED','PARKED') and channel_group='" . mysqli_real_escape_string($link, $group) . "';";
 	$rslt=mysql_to_mysqli($stmt, $link);
-	if ($DB) {echo "$stmt\n";}
+	if ($DB) {$MAIN2.="$stmt\n";}
 	$row=mysqli_fetch_row($rslt);
 	$hour_count[$i] = $row[0];
 	if ($hour_count[$i] > $hi_hour_count) {$hi_hour_count = $hour_count[$i];}
 	if ($hour_count[$i] > 0) {$last_full_record = $i;}
 	$stmt="select count(*) from park_log where parked_time >= '$query_date $h:00:00' and parked_time <= '$query_date $h:14:59' and status ='HUNGUP' and channel_group='" . mysqli_real_escape_string($link, $group) . "' and (talked_sec < 5 or talked_sec is null);";
 	$rslt=mysql_to_mysqli($stmt, $link);
-	if ($DB) {echo "$stmt\n";}
+	if ($DB) {$MAIN2.="$stmt\n";}
 	$row=mysqli_fetch_row($rslt);
 	$drop_count[$i] = $row[0];
 	$i++;
@@ -456,42 +575,42 @@ while ($i <= 96)
 
 	$stmt="select count(*) from park_log where parked_time >= '$query_date $h:15:00' and parked_time <= '$query_date $h:29:59' and status IN('HUNGUP','GRABBED','GRABBEDIVR','IVRPARKED','PARKED') and channel_group='" . mysqli_real_escape_string($link, $group) . "';";
 	$rslt=mysql_to_mysqli($stmt, $link);
-	if ($DB) {echo "$stmt\n";}
+	if ($DB) {$MAIN2.="$stmt\n";}
 	$row=mysqli_fetch_row($rslt);
 	$hour_count[$i] = $row[0];
 	if ($hour_count[$i] > $hi_hour_count) {$hi_hour_count = $hour_count[$i];}
 	if ($hour_count[$i] > 0) {$last_full_record = $i;}
 	$stmt="select count(*) from park_log where parked_time >= '$query_date $h:15:00' and parked_time <= '$query_date $h:29:59' and status ='HUNGUP' and channel_group='" . mysqli_real_escape_string($link, $group) . "' and (talked_sec < 5 or talked_sec is null);";
 	$rslt=mysql_to_mysqli($stmt, $link);
-	if ($DB) {echo "$stmt\n";}
+	if ($DB) {$MAIN2.="$stmt\n";}
 	$row=mysqli_fetch_row($rslt);
 	$drop_count[$i] = $row[0];
 	$i++;
 
 	$stmt="select count(*) from park_log where parked_time >= '$query_date $h:30:00' and parked_time <= '$query_date $h:44:59' and status IN('HUNGUP','GRABBED','GRABBEDIVR','IVRPARKED','PARKED') and channel_group='" . mysqli_real_escape_string($link, $group) . "';";
 	$rslt=mysql_to_mysqli($stmt, $link);
-	if ($DB) {echo "$stmt\n";}
+	if ($DB) {$MAIN2.="$stmt\n";}
 	$row=mysqli_fetch_row($rslt);
 	$hour_count[$i] = $row[0];
 	if ($hour_count[$i] > $hi_hour_count) {$hi_hour_count = $hour_count[$i];}
 	if ($hour_count[$i] > 0) {$last_full_record = $i;}
 	$stmt="select count(*) from park_log where parked_time >= '$query_date $h:30:00' and parked_time <= '$query_date $h:44:59' and status ='HUNGUP' and channel_group='" . mysqli_real_escape_string($link, $group) . "' and (talked_sec < 5 or talked_sec is null);";
 	$rslt=mysql_to_mysqli($stmt, $link);
-	if ($DB) {echo "$stmt\n";}
+	if ($DB) {$MAIN2.="$stmt\n";}
 	$row=mysqli_fetch_row($rslt);
 	$drop_count[$i] = $row[0];
 	$i++;
 
 	$stmt="select count(*) from park_log where parked_time >= '$query_date $h:45:00' and parked_time <= '$query_date $h:59:59' and status IN('HUNGUP','GRABBED','GRABBEDIVR','IVRPARKED','PARKED') and channel_group='" . mysqli_real_escape_string($link, $group) . "';";
 	$rslt=mysql_to_mysqli($stmt, $link);
-	if ($DB) {echo "$stmt\n";}
+	if ($DB) {$MAIN2.="$stmt\n";}
 	$row=mysqli_fetch_row($rslt);
 	$hour_count[$i] = $row[0];
 	if ($hour_count[$i] > $hi_hour_count) {$hi_hour_count = $hour_count[$i];}
 	if ($hour_count[$i] > 0) {$last_full_record = $i;}
 	$stmt="select count(*) from park_log where parked_time >= '$query_date $h:45:00' and parked_time <= '$query_date $h:59:59' and status ='HUNGUP' and channel_group='" . mysqli_real_escape_string($link, $group) . "' and (talked_sec < 5 or talked_sec is null);";
 	$rslt=mysql_to_mysqli($stmt, $link);
-	if ($DB) {echo "$stmt\n";}
+	if ($DB) {$MAIN2.="$stmt\n";}
 	$row=mysqli_fetch_row($rslt);
 	$drop_count[$i] = $row[0];
 	$i++;
@@ -501,8 +620,8 @@ while ($i <= 96)
 $hour_multiplier = MathZDC(100, $hi_hour_count);
 #$hour_multiplier = round($hour_multiplier, 0);
 
-echo "\n";
-echo _QXZ("GRAPH IN 15 MINUTE INCREMENTS OF TOTAL INCOMING CALLS FOR THIS GROUP")."\n";
+$MAIN2.="\n";
+$MAIN2.=_QXZ("GRAPH IN 15 MINUTE INCREMENTS OF TOTAL INCOMING CALLS FOR THIS GROUP")."\n";
 
 $k=1;
 $Mk=0;
@@ -526,10 +645,9 @@ while ($k <= 102)
 	}
 
 
-echo "+------+-------------------------------------------------------------------------------------------------------+-------+-------+\n";
-#echo "| HOUR | GRAPH IN 15 MINUTE INCREMENTS OF TOTAL INCOMING CALLS FOR THIS GROUP                                  | DROPS | TOTAL |\n";
-echo "| "._QXZ("HOUR",4)." |$call_scale| "._QXZ("DROPS",5)." | "._QXZ("TOTAL",5)." |\n";
-echo "+------+-------------------------------------------------------------------------------------------------------+-------+-------+\n";
+$MAIN2.="+------+-------------------------------------------------------------------------------------------------------+-------+-------+\n";
+$MAIN2.="| "._QXZ("HOUR",4)." |$call_scale| "._QXZ("DROPS",5)." | "._QXZ("TOTAL",5)." |\n";
+$MAIN2.="+------+-------------------------------------------------------------------------------------------------------+-------+-------+\n";
 
 $ZZ = '00';
 $i=0;
@@ -561,9 +679,9 @@ while ($i <= 96)
 		else
 			{
 			$hour_count[$i] =	sprintf("%-5s", $hour_count[$i]);
-			echo "|$time|";
-			$k=0;   while ($k <= 102) {echo " ";   $k++;}
-			echo "| $hour_count[$i] |\n";
+			$MAIN2.="|$time|";
+			$k=0;   while ($k <= 102) {$MAIN2.=" ";   $k++;}
+			$MAIN2.="| $hour_count[$i] |\n";
 			}
 		}
 	else
@@ -577,12 +695,12 @@ while ($i <= 96)
 			{
 			$hour_count[$i] =	sprintf("%-5s", $hour_count[$i]);
 
-			echo "|$time|";
-			$k=0;   while ($k <= $Xhour_count) {echo "*";   $k++;   $char_counter++;}
-			echo "*X";   $char_counter++;
-			$k=0;   while ($k <= $Yhour_count) {echo " ";   $k++;   $char_counter++;}
-				while ($char_counter <= 101) {echo " ";   $char_counter++;}
-			echo "| 0     | $hour_count[$i] |\n";
+			$MAIN2.="|$time|";
+			$k=0;   while ($k <= $Xhour_count) {$MAIN2.="*";   $k++;   $char_counter++;}
+			$MAIN2.="*X";   $char_counter++;
+			$k=0;   while ($k <= $Yhour_count) {$MAIN2.=" ";   $k++;   $char_counter++;}
+				while ($char_counter <= 101) {$MAIN2.=" ";   $char_counter++;}
+			$MAIN2.="| 0     | $hour_count[$i] |\n";
 
 			}
 		else
@@ -596,23 +714,26 @@ while ($i <= 96)
 			$hour_count[$i] =	sprintf("%-5s", $hour_count[$i]);
 			$drop_count[$i] =	sprintf("%-5s", $drop_count[$i]);
 
-			echo "|$time|";
-			$k=0;   while ($k <= $Xdrop_count) {echo ">";   $k++;   $char_counter++;}
-			echo "D";   $char_counter++;
-			$k=0;   while ($k <= $XXhour_count) {echo "*";   $k++;   $char_counter++;}
-			echo "X";   $char_counter++;
-			$k=0;   while ($k <= $Yhour_count) {echo " ";   $k++;   $char_counter++;}
-				while ($char_counter <= 102) {echo " ";   $char_counter++;}
-			echo "| $drop_count[$i] | $hour_count[$i] |\n";
+			$MAIN2.="|$time|";
+			$k=0;   while ($k <= $Xdrop_count) {$MAIN2.=">";   $k++;   $char_counter++;}
+			$MAIN2.="D";   $char_counter++;
+			$k=0;   while ($k <= $XXhour_count) {$MAIN2.="*";   $k++;   $char_counter++;}
+			$MAIN2.="X";   $char_counter++;
+			$k=0;   while ($k <= $Yhour_count) {$MAIN2.=" ";   $k++;   $char_counter++;}
+				while ($char_counter <= 102) {$MAIN2.=" ";   $char_counter++;}
+			$MAIN2.="| $drop_count[$i] | $hour_count[$i] |\n";
 			}
 		}
 	$i++;
 	$h++;
 	}
 
-echo "+------+-------------------------------------------------------------------------------------------------------+-------+-------+\n";
+$MAIN2.="+------+-------------------------------------------------------------------------------------------------------+-------+-------+\n";
 }
 
+$TEXT.=$MAIN2."\n";
+$HTML.=$MAIN2."
"; + if ($show_details) { $stmt="select * from park_log where parked_time >= '$query_date 00:00:01' and parked_time <= '$query_date 23:59:59' and channel_group='" . mysqli_real_escape_string($link, $group) . "' order by parked_time, grab_time, hangup_time desc"; $rslt=mysql_to_mysqli($stmt, $link); @@ -620,9 +741,14 @@ if ($show_details) { if (!$lower_limit) {$lower_limit=1;} if ($lower_limit+999>=mysqli_num_rows($rslt)) {$upper_limit=($lower_limit+mysqli_num_rows($rslt)%1000)-1;} else {$upper_limit=$lower_limit+999;} - echo "\n\n--- "._QXZ("PARK LOG RECORDS FOR")." $query_date, "._QXZ("CHANNEL GROUP")." $group\n --- "._QXZ("RECORDS")." #$lower_limit-$upper_limit "; - # echo "["._QXZ("DOWNLOAD")."]"; - echo "\n"; + $TEXT.="\n\n--- "._QXZ("PARK LOG RECORDS FOR")." $query_date, "._QXZ("CHANNEL GROUP")." $group\n --- "._QXZ("RECORDS")." #$lower_limit-$upper_limit "; + # $MAIN.="["._QXZ("DOWNLOAD")."]"; + $TEXT.="\n"; + + $HTML.="
"; + $HTML.=""; + $HTML.=""; + $HTML.="\n"; if (mysqli_num_rows($rslt)>0) { @@ -631,6 +757,21 @@ if ($show_details) { $output.="| "._QXZ("PARKED TIME",19)." | "._QXZ("GRAB TIME",19)." | "._QXZ("HANGUP TIME",19)." | "._QXZ("STATUS",10)." | "._QXZ("CHANNEL",30)." | "._QXZ("SERVER IP",15)." | "._QXZ("PARKED SEC",10)." | "._QXZ("TALKED SEC",10)." | "._QXZ("EXTENSION",20)." | "._QXZ("USER",10)." | "._QXZ("LEAD ID",10)." |\n"; $output.=$header; $i=0; + + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.="\n"; + while($row=mysqli_fetch_array($rslt)) { $i++; $output.="| "; @@ -645,29 +786,65 @@ if ($show_details) { $output.=sprintf("%-20s", substr($row["extension"], 0, 20))." | "; $output.=sprintf("%-10s", $row["user"])." | "; $output.=sprintf("%-10s", $row["lead_id"])." |\n"; + + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.="\n"; + } $output.=$header; $ll=$lower_limit-1000; + $HTML.=""; if ($ll>=1) { - $output.="[<<< "._QXZ("PREV")." 1000 "._QXZ("records")."]"; + $output.="[<<< "._QXZ("PREV")." 1000 "._QXZ("records")."]"; + $HTML.=""; } else { $output.=sprintf("%-23s", " "); + $HTML.=""; } $output.=sprintf("%-171s", " "); if (($lower_limit+1000)=mysqli_num_rows($rslt)) {$max_limit=mysqli_num_rows($rslt)-$upper_limit;} else {$max_limit=1000;} - $dial_log_rpt_hf.="["._QXZ("NEXT")." $max_limit "._QXZ("records")." >>>]"; + $output.="["._QXZ("NEXT")." $max_limit "._QXZ("records")." >>>]"; + $HTML.="
"._QXZ("PARK LOG RECORDS FOR")." $query_date, "._QXZ("CHANNEL GROUP")." $group\n --- "._QXZ("RECORDS")." #$lower_limit-$upper_limit
"._QXZ("PARKED TIME").""._QXZ("GRAB TIME").""._QXZ("HANGUP TIME").""._QXZ("STATUS").""._QXZ("CHANNEL").""._QXZ("SERVER IP").""._QXZ("PARKED SEC").""._QXZ("TALKED SEC").""._QXZ("EXTENSION").""._QXZ("USER").""._QXZ("LEAD ID")."
".$row["parked_time"]."".$row["grab_time"]."".$row["hangup_time"]."".$row["status"]."".$row["channel"]."".$row["server_ip"]."".$row["parked_sec"]."".$row["talked_sec"]."".$row["extension"]."".$row["user"]."".$row["lead_id"]."
[<<< "._QXZ("PREV")." 1000 "._QXZ("records")."] ["._QXZ("NEXT")." $max_limit "._QXZ("records")." >>>]"; } else { $output.=sprintf("%23s", " "); + $HTML.=" "; } $output.="\n"; - echo $output; + $TEXT.=$output; + $HTML.="
"; } } +$TEXT.="
\n"; + +if ($report_display_type=="HTML") { + $MAIN.=$HTML; +} else { + $MAIN.=$TEXT; +} + +$MAIN.="\n"; + +echo $HEADER; +require("admin_header.php"); +echo $MAIN; + + $endMS = microtime(); $startMSary = explode(" ",$startMS); $endMSary = explode(" ",$endMS); @@ -680,5 +857,3 @@ if ($DB) {echo "|$stmt|\n";} $rslt=mysql_to_mysqli($stmt, $link); ?> -
- diff --git a/www/vicidial/AST_performance_comparison_report.php b/www/vicidial/AST_performance_comparison_report.php index 36f8b2a1..b9bd0dbd 100644 --- a/www/vicidial/AST_performance_comparison_report.php +++ b/www/vicidial/AST_performance_comparison_report.php @@ -439,6 +439,44 @@ else $user_SQL = "and vicidial_users.user IN($user_SQL)"; } +##### BEGIN Define colors and logo ##### +$SSmenu_background='015B91'; +$SSframe_background='D9E6FE'; +$SSstd_row1_background='9BB9FB'; +$SSstd_row2_background='B9CBFD'; +$SSstd_row3_background='8EBCFD'; +$SSstd_row4_background='B6D3FC'; +$SSstd_row5_background='FFFFFF'; +$SSalt_row1_background='BDFFBD'; +$SSalt_row2_background='99FF99'; +$SSalt_row3_background='CCFFCC'; + +$screen_color_stmt="select admin_screen_colors from system_settings"; +$screen_color_rslt=mysql_to_mysqli($screen_color_stmt, $link); +$screen_color_row=mysqli_fetch_row($screen_color_rslt); +$agent_screen_colors="$screen_color_row[0]"; + +if ($agent_screen_colors != 'default') + { + $asc_stmt = "SELECT menu_background,frame_background,std_row1_background,std_row2_background,std_row3_background,std_row4_background,std_row5_background,alt_row1_background,alt_row2_background,alt_row3_background,web_logo FROM vicidial_screen_colors where colors_id='$agent_screen_colors';"; + $asc_rslt=mysql_to_mysqli($asc_stmt, $link); + $qm_conf_ct = mysqli_num_rows($asc_rslt); + if ($qm_conf_ct > 0) + { + $asc_row=mysqli_fetch_row($asc_rslt); + $SSmenu_background = $asc_row[0]; + $SSframe_background = $asc_row[1]; + $SSstd_row1_background = $asc_row[2]; + $SSstd_row2_background = $asc_row[3]; + $SSstd_row3_background = $asc_row[4]; + $SSstd_row4_background = $asc_row[5]; + $SSstd_row5_background = $asc_row[6]; + $SSalt_row1_background = $asc_row[7]; + $SSalt_row2_background = $asc_row[8]; + $SSalt_row3_background = $asc_row[9]; + $SSweb_logo = $asc_row[10]; + } + } if ($DB) {$HTML_text.="$user_group_string|$user_group_ct|$user_groupQS|$i
";} @@ -477,7 +515,7 @@ $HTML_text.="
"; $HTML_text.=""._QXZ("$report_name")." $NWB#performance_comparison_report$NWE\n"; $HTML_text.="
\n"; -$HTML_text.="
"._QXZ("Date").":
"; +$HTML_text.=""; + $agents_title="
  • "._QXZ("AGENTS").": ".implode(", ", $users); + $ASCII_rpt_header.=_QXZ("AGENTS").": ".implode(", ", $users)."\n"; + $CSV_text.="\""._QXZ("AGENTS").":\",\"".implode(", ", $users)."\"\n"; + $GRAPH_header.="
  • "; } $i=0; @@ -375,12 +378,51 @@ if ( (preg_match('/\-\-ALL\-\-/',$user_group_string) ) or ($user_group_ct < 1) ) {$user_group_SQL = "";} else { - $ASCII_rpt_header.=" User groups: ".implode(", ", $user_group)."\n"; - $CSV_text.="\"User groups:\",\"".implode(", ", $user_group)."\"\n"; - $GRAPH_header.=""; + $ASCII_rpt_header.=" "._QXZ("User groups").": ".implode(", ", $user_group)."\n"; + $CSV_text.="\""._QXZ("User groups").":\",\"".implode(", ", $user_group)."\"\n"; + $GRAPH_header.=""; } +##### BEGIN Define colors and logo ##### +$SSmenu_background='015B91'; +$SSframe_background='D9E6FE'; +$SSstd_row1_background='9BB9FB'; +$SSstd_row2_background='B9CBFD'; +$SSstd_row3_background='8EBCFD'; +$SSstd_row4_background='B6D3FC'; +$SSstd_row5_background='FFFFFF'; +$SSalt_row1_background='BDFFBD'; +$SSalt_row2_background='99FF99'; +$SSalt_row3_background='CCFFCC'; + +$screen_color_stmt="select admin_screen_colors from system_settings"; +$screen_color_rslt=mysql_to_mysqli($screen_color_stmt, $link); +$screen_color_row=mysqli_fetch_row($screen_color_rslt); +$agent_screen_colors="$screen_color_row[0]"; + +if ($agent_screen_colors != 'default') + { + $asc_stmt = "SELECT menu_background,frame_background,std_row1_background,std_row2_background,std_row3_background,std_row4_background,std_row5_background,alt_row1_background,alt_row2_background,alt_row3_background,web_logo FROM vicidial_screen_colors where colors_id='$agent_screen_colors';"; + $asc_rslt=mysql_to_mysqli($asc_stmt, $link); + $qm_conf_ct = mysqli_num_rows($asc_rslt); + if ($qm_conf_ct > 0) + { + $asc_row=mysqli_fetch_row($asc_rslt); + $SSmenu_background = $asc_row[0]; + $SSframe_background = $asc_row[1]; + $SSstd_row1_background = $asc_row[2]; + $SSstd_row2_background = $asc_row[3]; + $SSstd_row3_background = $asc_row[4]; + $SSstd_row4_background = $asc_row[5]; + $SSstd_row5_background = $asc_row[6]; + $SSalt_row1_background = $asc_row[7]; + $SSalt_row2_background = $asc_row[8]; + $SSalt_row3_background = $asc_row[9]; + $SSweb_logo = $asc_row[10]; + } + } + if ($DB) {echo "$user_group_string|$user_group_ct|$user_groupQS|$i
    \n";} $LINKbase = "$PHP_SELF?query_date=$query_date&end_date=$end_date$groupQS$user_groupQS&shift=$shift&DB=$DB&show_percentages=$show_percentages"; @@ -514,7 +556,11 @@ $HTML_text.="o_cal.a_tpl.yearscroll = false;\n"; $HTML_text.="// o_cal.a_tpl.weekstart = 1; // Monday week start\n"; $HTML_text.="\n"; #$HTML_text.="   "; -$HTML_text.=""; $HTML_text.="
    "._QXZ("Date").":
    "; $HTML_text.="\n"; $HTML_text.=""; diff --git a/www/vicidial/AST_recording_log_report.php b/www/vicidial/AST_recording_log_report.php index d413e081..62304877 100644 --- a/www/vicidial/AST_recording_log_report.php +++ b/www/vicidial/AST_recording_log_report.php @@ -9,6 +9,7 @@ # # 160115-2303 - First build # 170409-1538 - Added IP List validation code +# 170824-2130 - Added HTML formatting and screen colors # $startMS = microtime(); @@ -60,9 +61,9 @@ if (!isset($access_date_T)) {$access_date_T="00:00:00";} if (!isset($access_date_end_T)) {$access_date_end_T="23:59:59";} $access_date_from="$access_date_D $access_date_T"; $access_date_to="$access_date_end_D $access_date_end_T"; -$CSV_text="\"RECORDING ACCESS LOG REPORT\"\n"; -$CSV_text.="\"ACCESS DATE RANGE:\",\"$access_date_from to $access_date_to\"\n"; -$ASCII_rpt_header="ACCESS DATE RANGE: $access_date_from to $access_date_to\n"; +$CSV_text="\""._QXZ("RECORDING ACCESS LOG REPORT")."\"\n"; +$CSV_text.="\""._QXZ("ACCESS DATE RANGE").":\",\"$access_date_from "._QXZ("to")." $access_date_to\"\n"; +$ASCII_rpt_header=""._QXZ("ACCESS DATE RANGE").": $access_date_from "._QXZ("to")." $access_date_to\n"; $recording_date_SQL=""; if ($recording_date_D) @@ -70,9 +71,10 @@ if ($recording_date_D) if (!isset($recording_date_end_D)) {$recording_date_end_D=$recording_date_D;} $recording_date_from="$recording_date_D 00:00:00"; $recording_date_to="$recording_date_end_D 23:59:59"; + $recording_date_title="
  • "._QXZ("RECORDINGS CREATED")." $recording_date_D "._QXZ("to")." $recording_date_end_D"; $recording_date_SQL=" start_time>='$recording_date_from' and start_time<='$recording_date_to' and "; - $CSV_text.="\"RECORDING DATE RANGE:\",\"$recording_date_from to $recording_date_to\"\n"; - $ASCII_rpt_header.="RECORDING DATE RANGE: $recording_date_from to $recording_date_to\n"; + $CSV_text.="\""._QXZ("RECORDING DATE RANGE").":\",\"$recording_date_from "._QXZ("to")." $recording_date_to\"\n"; + $ASCII_rpt_header.=_QXZ("RECORDING DATE RANGE").": $recording_date_from "._QXZ("to")." $recording_date_to\n"; } @@ -355,9 +357,10 @@ if ( (preg_match('/\-\-ALL\-\-/',$user_string) ) or ($user_ct < 1) ) {$vu_user_SQL = ""; $vra_user_SQL = ""; $user_SQL="";} else { - $ASCII_rpt_header.="AGENTS: ".implode(", ", $users)."\n"; - $CSV_text.="\"AGENTS:\",\"".implode(", ", $users)."\"\n"; - $GRAPH_header.="
  • SELECTED AGENTS"._QXZ("SELECTED AGENTS")."SELECTED USER GROUPS"._QXZ("SELECTED USER GROUPS")."

    "; +$HTML_text.="
    "; +$HTML_text.=_QXZ("Display as:")."
    "; +$HTML_text.="\n

    "; $HTML_text.="\n"; if ($archives_available=="Y") { @@ -524,7 +570,7 @@ $HTML_text.="
    "; $HTML_text.="\n\n"; -$HTML_text.="
    \n";
    +$TEXT.="
    \n";
     
     if ($SUBMIT) 
     	{
    @@ -532,13 +578,28 @@ if ($SUBMIT)
     	if ($DB) {print $stmt."\n";}
     
     	$ASCII_border="+--------------+---------------------+------------+--------------------------------+---------------------+---------------------+-----------------+\n";
    -	$HTML_text.=$ASCII_rpt_header;
    -	$HTML_text.=sprintf("%110s", " ");
    -	$HTML_text.=""._QXZ("DOWNLOAD")."\n";
    +	$TEXT.=$ASCII_rpt_header;
    +	$TEXT.=sprintf("%110s", " ");
    +	$TEXT.=""._QXZ("DOWNLOAD")."\n";
     
    -	$HTML_text.=$ASCII_border;
    -	$HTML_text.="| RECORDING ID | RECORDING DATE/TIME | LEAD ID    | USER                           | DATE/TIME ACCESSED  | ACCESS RESULT       | IP              |\n";
    -	$HTML_text.=$ASCII_border;
    +	$HTML.="
    "; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.="\n"; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.="\n"; + + $TEXT.=$ASCII_border; + $TEXT.="| RECORDING ID | RECORDING DATE/TIME | LEAD ID | USER | DATE/TIME ACCESSED | ACCESS RESULT | IP |\n"; + $TEXT.=$ASCII_border; $CSV_text.="\n\"RECORDING ID\",\"RECORDING DATE/TIME\",\"LEAD ID\",\"USER\",\"DATE/TIME ACCESSED\",\"ACCESS RESULT\",\"IP\"\n"; @@ -546,31 +607,41 @@ if ($SUBMIT) while ($row=mysqli_fetch_array($rslt)) { $full_user=substr($row["user"]." - ".$row["full_name"], 0, 30); - $HTML_text.="| "; - $HTML_text.=sprintf("%-12s", $row["recording_id"])." | "; - $HTML_text.=sprintf("%-19s", $row["start_time"])." | "; - $HTML_text.=sprintf("%-10s", $row["lead_id"])." | "; - $HTML_text.=sprintf("%-30s", $full_user)." | "; - $HTML_text.=sprintf("%-19s", $row["access_datetime"])." | "; - $HTML_text.=sprintf("%-19s", $row["access_result"])." | "; - $HTML_text.=sprintf("%-15s", $row["ip"])." |\n"; + $TEXT.="| "; + $TEXT.=sprintf("%-12s", $row["recording_id"])." | "; + $TEXT.=sprintf("%-19s", $row["start_time"])." | "; + $TEXT.=sprintf("%-10s", $row["lead_id"])." | "; + $TEXT.=sprintf("%-30s", $full_user)." | "; + $TEXT.=sprintf("%-19s", $row["access_datetime"])." | "; + $TEXT.=sprintf("%-19s", $row["access_result"])." | "; + $TEXT.=sprintf("%-15s", $row["ip"])." |\n"; + + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.=""; + $HTML.="\n"; + $CSV_text.="\"$row[recording_id]\",\"$row[start_time]\",\"$row[lead_id]\",\"$full_user\",\"$row[access_datetime]\",\"$row[access_result]\",\"$row[ip]\"\n"; } - $HTML_text.=$ASCII_border; -/* -+-------------------------+--------------+---------+------+---------------------+---------------------+-----------+------------+---------------------+ -| recording_access_log_id | recording_id | lead_id | user | access_datetime | access_result | full_name | user_group | start_time | ip -+-------------------------+--------------+---------+------+---------------------+---------------------+-----------+------------+---------------------+ -| 1599 | 164677 | 1079414 | 6666 | 2016-01-12 23:50:04 | INVALID PERMISSIONS | Admin | ADMIN | 2016-01-09 08:22:17 | -| 1600 | 164668 | 1177978 | 6666 | 2016-01-12 23:52:49 | ACCESSED | Admin | ADMIN | 2016-01-06 22:25:08 | -| 1601 | 164678 | 1177980 | 6666 | 2016-01-12 23:57:43 | ACCESSED | Admin | ADMIN | 2016-01-09 08:27:56 | -| 1602 | 164678 | 1177980 | 6666 | 2016-01-13 00:42:54 | INVALID PERMISSIONS | Admin | ADMIN | 2016-01-09 08:27:56 | -+-------------------------+--------------+---------+------+---------------------+---------------------+-----------+------------+---------------------+ -*/ + $TEXT.=$ASCII_border; } -$HTML_text.=""; +$TEXT.=""; +$HTML.="
    "._QXZ("RECORDING ACCESS LOG FOR:")."
    • "._QXZ("RECORDS VIEWED ")."$access_date_from "._QXZ("TO")." $access_date_to$recording_date_title $agents_title
    "._QXZ("DOWNLOAD")."
    "._QXZ("RECORDING ID").""._QXZ("RECORDING DATE/TIME").""._QXZ("LEAD ID").""._QXZ("USER").""._QXZ("DATE/TIME ACCESSED").""._QXZ("ACCESS RESULT").""._QXZ("IP")."
    ".$row["recording_id"]."".$row["start_time"]."".$row["lead_id"]."".$row["user"]." - ".$row["full_name"]."".$row["access_datetime"]."".$row["access_result"]."".$row["ip"]."
    "; + +if ($report_display_type=="HTML") { + $HTML_text.=$HTML; +} else { + $HTML_text.=$TEXT; +} + +$HTML_text.=""; if ($file_download == 0 || !$file_download) diff --git a/www/vicidial/AST_team_performance_detail.php b/www/vicidial/AST_team_performance_detail.php index c38b4c1a..086cd272 100644 --- a/www/vicidial/AST_team_performance_detail.php +++ b/www/vicidial/AST_team_performance_detail.php @@ -453,6 +453,46 @@ else $user_group_SQL = preg_replace('/,$/i', '',$user_group_SQL); $user_group_SQL = "and ".$vicidial_agent_log_table.".user_group IN($user_group_SQL)"; } + +##### BEGIN Define colors and logo ##### +$SSmenu_background='015B91'; +$SSframe_background='D9E6FE'; +$SSstd_row1_background='9BB9FB'; +$SSstd_row2_background='B9CBFD'; +$SSstd_row3_background='8EBCFD'; +$SSstd_row4_background='B6D3FC'; +$SSstd_row5_background='FFFFFF'; +$SSalt_row1_background='BDFFBD'; +$SSalt_row2_background='99FF99'; +$SSalt_row3_background='CCFFCC'; + +$screen_color_stmt="select admin_screen_colors from system_settings"; +$screen_color_rslt=mysql_to_mysqli($screen_color_stmt, $link); +$screen_color_row=mysqli_fetch_row($screen_color_rslt); +$agent_screen_colors="$screen_color_row[0]"; + +if ($agent_screen_colors != 'default') + { + $asc_stmt = "SELECT menu_background,frame_background,std_row1_background,std_row2_background,std_row3_background,std_row4_background,std_row5_background,alt_row1_background,alt_row2_background,alt_row3_background,web_logo FROM vicidial_screen_colors where colors_id='$agent_screen_colors';"; + $asc_rslt=mysql_to_mysqli($asc_stmt, $link); + $qm_conf_ct = mysqli_num_rows($asc_rslt); + if ($qm_conf_ct > 0) + { + $asc_row=mysqli_fetch_row($asc_rslt); + $SSmenu_background = $asc_row[0]; + $SSframe_background = $asc_row[1]; + $SSstd_row1_background = $asc_row[2]; + $SSstd_row2_background = $asc_row[3]; + $SSstd_row3_background = $asc_row[4]; + $SSstd_row4_background = $asc_row[5]; + $SSstd_row5_background = $asc_row[6]; + $SSalt_row1_background = $asc_row[7]; + $SSalt_row2_background = $asc_row[8]; + $SSalt_row3_background = $asc_row[9]; + $SSweb_logo = $asc_row[10]; + } + } + ###################################### if ($DB) {$HTML_text.="$user_group_string|$user_group_ct|$user_groupQS|$i
    ";} @@ -489,7 +529,7 @@ $HTML_text.="
    "; $HTML_text.=""._QXZ("$report_name")." $NWB#team_performance_detail$NWE\n"; $HTML_text.="
    \n"; -$HTML_text.="
    "; +$HTML_text.="
    "; $HTML_text.="\n"; $HTML_text.="\n"; $HTML_text.="Date Range:
    \n"; diff --git a/www/vicidial/AST_user_group_hourly_detail.php b/www/vicidial/AST_user_group_hourly_detail.php index b3810c5e..ed968163 100644 --- a/www/vicidial/AST_user_group_hourly_detail.php +++ b/www/vicidial/AST_user_group_hourly_detail.php @@ -610,7 +610,7 @@ if ($file_download > 0) echo ""; -echo "
    "._QXZ("Date").":
    "; +echo "
    "._QXZ("Date").":
    "; echo "\n"; echo ""; ?> diff --git a/www/vicidial/AST_user_group_hourly_detail_v2.php b/www/vicidial/AST_user_group_hourly_detail_v2.php index 8a10db5e..2b109e51 100644 --- a/www/vicidial/AST_user_group_hourly_detail_v2.php +++ b/www/vicidial/AST_user_group_hourly_detail_v2.php @@ -654,7 +654,7 @@ if ($file_download > 0) echo ""; -echo "
    "._QXZ("Date").":
    "; +echo "
    "._QXZ("Date").":
    "; echo "\n"; echo ""; ?> diff --git a/www/vicidial/AST_usergroup_login_report.php b/www/vicidial/AST_usergroup_login_report.php index c715dd23..5c544a64 100644 --- a/www/vicidial/AST_usergroup_login_report.php +++ b/www/vicidial/AST_usergroup_login_report.php @@ -377,7 +377,7 @@ $HTML_text.="
    "; $HTML_text.=""._QXZ("$report_name")." $NWB#usergroup_login$NWE\n"; $HTML_text.="\n"; -$HTML_text.="
     
    "; +$HTML_text.="\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; + echo "\n"; echo "
     
    "; $HTML_text.="\n"; $HTML_text.="\n"; $HTML_text.="
    "._QXZ("Teams/User Groups").":
    "; diff --git a/www/vicidial/admin.php b/www/vicidial/admin.php index 03759090..078c19ad 100644 --- a/www/vicidial/admin.php +++ b/www/vicidial/admin.php @@ -2263,6 +2263,8 @@ if (isset($_GET["inbound_survey_callmenu"])) {$inbound_survey_callmenu=$_GET[" elseif (isset($_POST["inbound_survey_callmenu"])) {$inbound_survey_callmenu=$_POST["inbound_survey_callmenu"];} if (isset($_GET["allow_manage_active_lists"])) {$allow_manage_active_lists=$_GET["allow_manage_active_lists"];} elseif (isset($_POST["allow_manage_active_lists"])) {$allow_manage_active_lists=$_POST["allow_manage_active_lists"];} +if (isset($_GET["filename_override"])) {$filename_override=$_GET["filename_override"];} + elseif (isset($_POST["filename_override"])) {$filename_override=$_POST["filename_override"];} if (isset($script_id)) {$script_id= strtoupper($script_id);} @@ -3182,6 +3184,7 @@ if ($non_latin < 1) $api_ip_list = preg_replace('/[^-_0-9a-zA-Z]/','',$api_ip_list); $ip_list_id = preg_replace('/[^-_0-9a-zA-Z]/','',$ip_list_id); $inbound_survey_callmenu = preg_replace('/[^-_0-9a-zA-Z]/','',$inbound_survey_callmenu); + $filename_override = preg_replace('/[^-_0-9a-zA-Z]/','',$filename_override); ### ALPHA-NUMERIC and underscore and dash and slash and dot $menu_timeout_prompt = preg_replace('/[^-\/\|\._0-9a-zA-Z]/','',$menu_timeout_prompt); @@ -4165,12 +4168,13 @@ else # 170818-0741 - Added User Group Hourly Report v2(detail) # 170819-0949 - Added allow_manage_active_lists system setting # 170821-2009 - Fix for issue #1036 +# 170825-1708 - Added filename_override option for Automated Reports, added more space for report_times # # 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-625a'; -$build = '170821-2009'; +$admin_version = '2.14-626a'; +$build = '170825-1708'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -16673,7 +16677,7 @@ if ($ADD==494111111111) $p++; } - $stmt="UPDATE vicidial_automated_reports set report_name='$report_name',report_server='$report_server',report_times='$report_times',report_weekdays='$REPORT_weekdays',report_monthdays='$report_monthdays',report_destination='$report_destination',email_from='$email_from',email_to='$email_to',email_subject='$email_subject',ftp_server='$ftp_server',ftp_user='" . mysqli_real_escape_string($link, $ftp_user) ."',ftp_pass='" . mysqli_real_escape_string($link, $ftp_pass) ."',ftp_directory='$ftp_directory',report_url='" . mysqli_real_escape_string($link, $report_url) ."',run_now_trigger='$run_now_trigger',active='$active',user_group='$user_group' where report_id='$report_id';"; + $stmt="UPDATE vicidial_automated_reports set report_name='$report_name',report_server='$report_server',report_times='$report_times',report_weekdays='$REPORT_weekdays',report_monthdays='$report_monthdays',report_destination='$report_destination',email_from='$email_from',email_to='$email_to',email_subject='$email_subject',ftp_server='$ftp_server',ftp_user='" . mysqli_real_escape_string($link, $ftp_user) ."',ftp_pass='" . mysqli_real_escape_string($link, $ftp_pass) ."',ftp_directory='$ftp_directory',report_url='" . mysqli_real_escape_string($link, $report_url) ."',run_now_trigger='$run_now_trigger',active='$active',user_group='$user_group',filename_override='$filename_override' where report_id='$report_id';"; $rslt=mysql_to_mysqli($stmt, $link); echo "
    "._QXZ("AUTOMATED REPORT MODIFIED").": $report_id\n"; @@ -34265,7 +34269,7 @@ if ($ADD==394111111111) $o++; } - $stmt="SELECT report_id,report_name,report_last_run,report_last_length,report_server,report_times,report_weekdays,report_monthdays,report_destination,email_from,email_to,email_subject,ftp_server,ftp_user,ftp_pass,ftp_directory,report_url,run_now_trigger,active,user_group from vicidial_automated_reports where report_id='$report_id' $LOGadmin_viewable_groupsSQL;"; + $stmt="SELECT report_id,report_name,report_last_run,report_last_length,report_server,report_times,report_weekdays,report_monthdays,report_destination,email_from,email_to,email_subject,ftp_server,ftp_user,ftp_pass,ftp_directory,report_url,run_now_trigger,active,user_group,filename_override from vicidial_automated_reports where report_id='$report_id' $LOGadmin_viewable_groupsSQL;"; $rslt=mysql_to_mysqli($stmt, $link); $row=mysqli_fetch_row($rslt); $report_id = $row[0]; @@ -34288,6 +34292,7 @@ if ($ADD==394111111111) $run_now_trigger = $row[17]; $active = $row[18]; $user_group = $row[19]; + $filename_override = $row[20]; echo ""; @@ -34308,7 +34313,7 @@ if ($ADD==394111111111) echo "$servers_list"; echo "\n"; echo "$NWB#auto_reports-report_server$NWE
    "._QXZ("Report Times").": $NWB#auto_reports-report_times$NWE
    "._QXZ("Report Times").": $NWB#auto_reports-report_times$NWE
    "._QXZ("Report Weekdays").":\n"; echo ""._QXZ("FTP User").": $NWB#auto_reports-ftp_user$NWE
    "._QXZ("FTP Pass").": $NWB#auto_reports-ftp_pass$NWE
    "._QXZ("FTP Directory").": $NWB#auto_reports-ftp_directory$NWE
    "._QXZ("Filename Override").": $NWB#auto_reports-filename_override$NWE
    "._QXZ("Active").": BGCOLOR=#E6E6E6 cellpadding=2 cellspacing=0> +
    BGCOLOR=# cellpadding=2 cellspacing=0>
      \n"; +echo "
      \n"; $STARTtime = date("U"); $TODAY = date("Y-m-d"); @@ -457,27 +495,27 @@ if ($action == "CALLCARD_DETAIL") echo "\n"; echo "\n"; echo "
    \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "
    "._QXZ("Card ID").": $card_id
    "._QXZ("PIN").": $pin
    "._QXZ("Status").": $status
    "._QXZ("Run").": $run
    "._QXZ("Batch").": $batch
    "._QXZ("Pack").": $pack
    "._QXZ("Sequence").": $sequence
    "._QXZ("Balance Minutes").": $balance_minutes
    "._QXZ("Initial Minutes").": $initial_minutes
    "._QXZ("Initial Value").": $initial_value
    "._QXZ("Purchase Order").": $note_purchase_order
    "._QXZ("Printer").": $note_printer
    "._QXZ("DID").": $note_did
    "._QXZ("In-Group").": $inbound_group_id
    "._QXZ("Language").": $note_language
    "._QXZ("Name").": $note_name
    "._QXZ("Comments").": $note_comments
    "._QXZ("Create User/Date").": $create_user / $create_time
    "._QXZ("Activate User/Date").": $activate_user / $activate_time
    "._QXZ("Used User/Date").": $used_user / $used_time
    "._QXZ("Void User/Date").": $void_user / $void_time
    "._QXZ("Card ID").": $card_id
    "._QXZ("PIN").": $pin
    "._QXZ("Status").": $status
    "._QXZ("Run").": $run
    "._QXZ("Batch").": $batch
    "._QXZ("Pack").": $pack
    "._QXZ("Sequence").": $sequence
    "._QXZ("Balance Minutes").": $balance_minutes
    "._QXZ("Initial Minutes").": $initial_minutes
    "._QXZ("Initial Value").": $initial_value
    "._QXZ("Purchase Order").": $note_purchase_order
    "._QXZ("Printer").": $note_printer
    "._QXZ("DID").": $note_did
    "._QXZ("In-Group").": $inbound_group_id
    "._QXZ("Language").": $note_language
    "._QXZ("Name").": $note_name
    "._QXZ("Comments").": $note_comments
    "._QXZ("Create User/Date").": $create_user / $create_time
    "._QXZ("Activate User/Date").": $activate_user / $activate_time
    "._QXZ("Used User/Date").": $used_user / $used_time
    "._QXZ("Void User/Date").": $void_user / $void_time
    \n"; echo "


    \n"; @@ -855,23 +893,23 @@ if ($action == "GENERATE") echo "\n"; echo "\n"; echo "
    \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; - echo "\n"; + echo "\n"; echo "
    "._QXZ("Run").":
    "._QXZ("Starting Batch").":
    "._QXZ("IDs in Batch").":
    "._QXZ("Starting Sequence").":
    "._QXZ("Total").":
    "._QXZ("Balance Minutes").":
    "._QXZ("Initial Value").":
    "._QXZ("Initial Minutes").":
    "._QXZ("Purchase Order").":
    "._QXZ("Printer").":
    "._QXZ("DID").":
    "._QXZ("In-Group").":
    "._QXZ("Language").":
    "._QXZ("Name").":
    "._QXZ("Comment").":
    "._QXZ("Run").":
    "._QXZ("Starting Batch").":
    "._QXZ("IDs in Batch").":
    "._QXZ("Starting Sequence").":
    "._QXZ("Total").":
    "._QXZ("Balance Minutes").":
    "._QXZ("Initial Value").":
    "._QXZ("Initial Minutes").":
    "._QXZ("Purchase Order").":
    "._QXZ("Printer").":
    "._QXZ("DID").":
    "._QXZ("In-Group").":
    "._QXZ("Language").":
    "._QXZ("Name").":
    "._QXZ("Comment").":
    \n"; echo "\n"; echo "
    \n"; @@ -999,12 +1037,12 @@ if ($action == "SEARCH") echo "\n"; echo "\n"; echo "
    \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "
    "._QXZ("PIN").":
    "._QXZ("Card ID").":
    "._QXZ("Run").":
    "._QXZ("Batch").":
    "._QXZ("Sequence").":
    "._QXZ("PIN").":
    "._QXZ("Card ID").":
    "._QXZ("Run").":
    "._QXZ("Batch").":
    "._QXZ("Sequence").":
    \n"; echo "\n"; echo "\n"; diff --git a/www/vicidial/help.php b/www/vicidial/help.php index 815da72a..76026087 100644 --- a/www/vicidial/help.php +++ b/www/vicidial/help.php @@ -132,6 +132,7 @@ # 170623-2134 - Changed parameters for password recommendations # 170816-1057 - Added inbound after call entries # 170819-0951 - Added allow_manage_active_lists entry +# 170825-1129 - Added auto_reports-filename_override entry # @@ -5981,6 +5982,11 @@ FR_SPAC 00 00 00 00 00 - - +
    + +
    + - +

    @@ -5994,7 +6000,7 @@ FR_SPAC 00 00 00 00 00 -

    - - + -