From 9b528ee9f6631532a52fedd923166846c712f4a0 Mon Sep 17 00:00:00 2001 From: mattf Date: Sat, 19 Aug 2017 15:34:05 +0000 Subject: [PATCH] Added system setting to allow Lead Management admin utilities to handle active lists. Changed Advanced Lead Management tool to allow you to select multiple lists. Added HTML display option to several reports git-svn-id: svn://192.168.202.10@2806 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/UPGRADE | 4 + .../trunk/extras/MySQL_AST_CREATE_tables.sql | 5 +- agc_2-X/trunk/extras/upgrade_2.14.sql | 4 + .../vicidial/AST_agent_debug_log_report.php | 6 +- .../www/vicidial/AST_hangup_cause_report.php | 150 ++++++++++++-- .../vicidial/AST_user_group_hourly_detail.php | 20 +- .../AST_user_group_hourly_detail_v2.php | 8 +- .../vicidial/AST_usergroup_login_report.php | 97 ++++++++- .../www/vicidial/AST_webserver_url_report.php | 185 ++++++++++++++---- agc_2-X/trunk/www/vicidial/admin.php | 18 +- agc_2-X/trunk/www/vicidial/help.php | 6 + agc_2-X/trunk/www/vicidial/lead_tools.php | 18 +- .../www/vicidial/lead_tools_advanced.php | 86 ++++---- agc_2-X/trunk/www/vicidial/list_merge.php | 18 +- agc_2-X/trunk/www/vicidial/list_split.php | 18 +- 15 files changed, 504 insertions(+), 139 deletions(-) diff --git a/agc_2-X/trunk/UPGRADE b/agc_2-X/trunk/UPGRADE index b267b760..94fd1fad 100644 --- a/agc_2-X/trunk/UPGRADE +++ b/agc_2-X/trunk/UPGRADE @@ -186,6 +186,10 @@ OTHER CHANGES: agent has handled their call. Overrides agent HANGUP CUSTOMER button to send call to survey instead. +44. Added system setting to allow Lead Management admin utilities to handle + active lists. Also changed Advanced Lead Management tool to allow + you to select multiple lists. + diff --git a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql index 4db65045..3687cfd9 100644 --- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql @@ -1720,7 +1720,8 @@ allow_ip_lists ENUM('0','1','2') default '0', system_ip_blacklist VARCHAR(30) default '', agent_push_events ENUM('0','1') default '0', agent_push_url TEXT, -hide_inactive_lists ENUM('0','1') default '0' +hide_inactive_lists ENUM('0','1') default '0', +allow_manage_active_lists ENUM('0','1') default '0' ) ENGINE=MyISAM; CREATE TABLE vicidial_campaigns_list_mix ( @@ -4063,4 +4064,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='1512',db_schema_update_date=NOW(),reload_timestamp=NOW(); +UPDATE system_settings SET db_schema_version='1513',db_schema_update_date=NOW(),reload_timestamp=NOW(); diff --git a/agc_2-X/trunk/extras/upgrade_2.14.sql b/agc_2-X/trunk/extras/upgrade_2.14.sql index 83ce1075..1b7ca00c 100644 --- a/agc_2-X/trunk/extras/upgrade_2.14.sql +++ b/agc_2-X/trunk/extras/upgrade_2.14.sql @@ -351,3 +351,7 @@ ALTER TABLE vicidial_inbound_groups ADD inbound_survey_question_filename TEXT; ALTER TABLE vicidial_inbound_groups ADD inbound_survey_callmenu TEXT; UPDATE system_settings SET db_schema_version='1512',db_schema_update_date=NOW() where db_schema_version < 1512; + +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; diff --git a/agc_2-X/trunk/www/vicidial/AST_agent_debug_log_report.php b/agc_2-X/trunk/www/vicidial/AST_agent_debug_log_report.php index 6161dc5f..aa064357 100644 --- a/agc_2-X/trunk/www/vicidial/AST_agent_debug_log_report.php +++ b/agc_2-X/trunk/www/vicidial/AST_agent_debug_log_report.php @@ -7,7 +7,7 @@ # 150724-0740 - First build # 150727-2111 - Added different colors for higher run times, added user variable, code cleanup # 170409-1547 - Added IP List validation code -# 170818-0751 - Added HTML display option +# 170817-2330 - Added HTML format option # $startMS = microtime(); @@ -226,8 +226,8 @@ $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($stmt, $link); - $qm_conf_ct = mysqli_num_rows($rslt); + $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); diff --git a/agc_2-X/trunk/www/vicidial/AST_hangup_cause_report.php b/agc_2-X/trunk/www/vicidial/AST_hangup_cause_report.php index c1e72c3b..409a6a53 100644 --- a/agc_2-X/trunk/www/vicidial/AST_hangup_cause_report.php +++ b/agc_2-X/trunk/www/vicidial/AST_hangup_cause_report.php @@ -15,6 +15,7 @@ # 141114-0837 - Finalized adding QXZ translation to all admin files # 141230-1457 - Added code for on-the-fly language translations display # 170409-1534 - Added IP List validation code +# 170818-2345 - Added HTML formatting # $startMS = microtime(); @@ -53,6 +54,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_TIME=date("U"); @@ -559,6 +562,44 @@ $hangup_cause_SQL=preg_replace('/ OR$/', '', $hangup_cause_SQL); $hangup_cause_SQL = preg_replace('/,$/i', '',$hangup_cause_SQL); $hangup_cause_SQL = "and ($hangup_cause_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 (strlen($hangup_cause_SQL)<7) {$hangup_cause_SQL="";} @@ -682,43 +723,87 @@ $MAIN.=""; $MAIN.="\n"; +$MAIN.=_QXZ("Display as:")."
"; +$MAIN.="\n

"; $MAIN.="

\n"; $MAIN.="\n"; if ($SUBMIT && $server_ip_ct>0) { $stmt="SELECT hangup_cause, dialstatus, count(*) as ct From vicidial_carrier_log where call_date>='$query_date $query_date_D' and call_date<='$query_date $query_date_T' $server_ip_SQL $hangup_cause_SQL group by hangup_cause, dialstatus order by hangup_cause, dialstatus"; $rslt=mysql_to_mysqli($stmt, $link); - $MAIN.="
\n";
-	if ($DB) {$MAIN.=$stmt."\n";}
+	$TEXT.="
\n";
+	if ($DB) {$TEXT.=$stmt."\n";}
 	if (mysqli_num_rows($rslt)>0) {
-		$MAIN.="--- "._QXZ("DIAL STATUS BREAKDOWN FOR")." $query_date, $query_date_D "._QXZ("TO")." $query_date_T $server_rpt_string\n";
-		$MAIN.="+--------------+-------------+---------+\n";
-		$MAIN.="| "._QXZ("HANGUP CAUSE",12)." | "._QXZ("DIAL STATUS",11)." |  "._QXZ("COUNT",6)." |\n";
-		$MAIN.="+--------------+-------------+---------+\n";
+		$TEXT.="--- "._QXZ("DIAL STATUS BREAKDOWN FOR")." $query_date, $query_date_D "._QXZ("TO")." $query_date_T $server_rpt_string\n";
+		$TEXT.="+--------------+-------------+---------+\n";
+		$TEXT.="| "._QXZ("HANGUP CAUSE",12)." | "._QXZ("DIAL STATUS",11)." |  "._QXZ("COUNT",6)." |\n";
+		$TEXT.="+--------------+-------------+---------+\n";
+
+		$HTML.="
";
+		$HTML.="";
+		$HTML.="";
+		$HTML.="\n";
+		$HTML.="";
+		$HTML.="";
+		$HTML.="";
+		$HTML.="";
+		$HTML.="\n";
+
 		$total_count=0;
 		while ($row=mysqli_fetch_array($rslt)) {
-			$MAIN.="| ".sprintf("%-13s", $row["hangup_cause"]);
-			$MAIN.="| ".sprintf("%-12s", $row["dialstatus"]);
-			$MAIN.="| ".sprintf("%-8s", $row["ct"]);
-			$MAIN.="|\n";
+			$TEXT.="| ".sprintf("%-13s", $row["hangup_cause"]);
+			$TEXT.="| ".sprintf("%-12s", $row["dialstatus"]);
+			$TEXT.="| ".sprintf("%-8s", $row["ct"]);
+			$TEXT.="|\n";
 			$total_count+=$row["ct"];
+			$HTML.="";
+			$HTML.="";
+			$HTML.="";
+			$HTML.="";
+			$HTML.="\n";
 		}
-		$MAIN.="+--------------+-------------+---------+\n";
-		$MAIN.="| "._QXZ("TOTAL",26,"r")." | ".sprintf("%-8s", $total_count)."|\n";
-		$MAIN.="+--------------+-------------+---------+\n\n\n";
+		$TEXT.="+--------------+-------------+---------+\n";
+		$TEXT.="| "._QXZ("TOTAL",26,"r")." | ".sprintf("%-8s", $total_count)."|\n";
+		$TEXT.="+--------------+-------------+---------+\n\n\n";
+		$HTML.="";
+		$HTML.="";
+		$HTML.="";
+		$HTML.="
"._QXZ("DIAL STATUS BREAKDOWN FOR")." $query_date, $query_date_D "._QXZ("TO")." $query_date_T $server_rpt_string
"._QXZ("HANGUP CAUSE").""._QXZ("DIAL STATUS").""._QXZ("COUNT")."
".$row["hangup_cause"]."".$row["dialstatus"]."".$row["ct"]."
"._QXZ("TOTAL")."".$total_count."


\n";
 
 		$rpt_stmt="SELECT vicidial_carrier_log.*, vicidial_log.phone_number from vicidial_carrier_log left join vicidial_log on vicidial_log.uniqueid=vicidial_carrier_log.uniqueid where vicidial_carrier_log.call_date>='$query_date $query_date_D' and vicidial_carrier_log.call_date<='$query_date $query_date_T' $server_ip_SQL $hangup_cause_SQL $sip_hangup_cause_SQL order by vicidial_carrier_log.call_date asc";
 		$rpt_rslt=mysql_to_mysqli($rpt_stmt, $link);
-		if ($DB) {$MAIN.=$rpt_stmt."\n";}
+		if ($DB) {$TEXT.=$rpt_stmt."\n";}
 
 		if (!$lower_limit) {$lower_limit=1;}
 		if ($lower_limit+999>=mysqli_num_rows($rpt_rslt)) {$upper_limit=($lower_limit+mysqli_num_rows($rpt_rslt)%1000)-1;} else {$upper_limit=$lower_limit+999;}
 		
-		$MAIN.="--- "._QXZ("CARRIER LOG RECORDS FOR")." $query_date, $query_date_D "._QXZ("TO")." $query_date_T $server_rpt_string, $HC_rpt_string, $DS_rpt_string\n --- "._QXZ("RECORDS")." #$lower_limit-$upper_limit               ["._QXZ("DOWNLOAD")."]\n";
+		$TEXT.="--- "._QXZ("CARRIER LOG RECORDS FOR")." $query_date, $query_date_D "._QXZ("TO")." $query_date_T $server_rpt_string, $HC_rpt_string, $DS_rpt_string\n --- "._QXZ("RECORDS")." #$lower_limit-$upper_limit               ["._QXZ("DOWNLOAD")."]\n";
 		$carrier_rpt.="+----------------------+---------------------+-----------------+-----------+--------------+-------------+------------------------------------------+-----------+---------------+--------------+--------------+--------------------------------+\n";
 		$carrier_rpt.="| "._QXZ("UNIQUE ID",20)." | "._QXZ("CALL DATE",19)." | "._QXZ("SERVER IP",15)." | "._QXZ("LEAD ID",9)." | "._QXZ("HANGUP CAUSE",11)." | "._QXZ("DIAL STATUS",11)." | "._QXZ("CHANNEL",40)." | "._QXZ("DIAL TIME",9)." | "._QXZ("ANSWERED TIME",13)." | "._QXZ("PHONE NUMBER",12)." | "._QXZ("SIP RESPONSE",12)." | "._QXZ("SIP REASON",30)." |\n";
 		$carrier_rpt.="+----------------------+---------------------+-----------------+-----------+--------------+-------------+------------------------------------------+-----------+---------------+--------------+--------------+--------------------------------+\n";
 		$CSV_text="\""._QXZ("UNIQUE ID")."\",\""._QXZ("CALL DATE")."\",\""._QXZ("SERVER IP")."\",\""._QXZ("LEAD ID")."\",\""._QXZ("HANGUP CAUSE")."\",\""._QXZ("DIAL STATUS")."\",\""._QXZ("CHANNEL")."\",\""._QXZ("DIAL TIME")."\",\""._QXZ("ANSWERED TIME")."\",\""._QXZ("PHONE NUMBER")."\",\""._QXZ("SIP RESPONSE")."\",\""._QXZ("SIP REASON")."\"\n";
 
+		$HTML.="";
+		$HTML.="";
+		$HTML.="";
+		$HTML.="";
+		$HTML.="\n";
+		$HTML.="";
+		$HTML.="";
+		$HTML.="";
+		$HTML.="";
+		$HTML.="";
+		$HTML.="";
+		$HTML.="";
+		$HTML.="";
+		$HTML.="";
+		$HTML.="";
+		$HTML.="";
+		$HTML.="";
+		$HTML.="";
+		$HTML.="\n";
+
 		for ($i=1; $i<=mysqli_num_rows($rpt_rslt); $i++) {
 			$row=mysqli_fetch_array($rpt_rslt);
 			$phone_number=""; $phone_note="";
@@ -751,30 +836,59 @@ if ($SUBMIT && $server_ip_ct>0) {
 				$carrier_rpt.="| ".sprintf("%-13s", $phone_number); 
 				$carrier_rpt.="| ".sprintf("%-13s", $row["sip_hangup_cause"]); 
 				$carrier_rpt.="| ".sprintf("%-31s", $row["sip_hangup_reason"])."|\n"; 
+
+				$HTML.="";
+				$HTML.="";
+				$HTML.="";
+				$HTML.="";
+				$HTML.="";
+				$HTML.="";
+				$HTML.="";
+				$HTML.="";
+				$HTML.="";
+				$HTML.="";
+				$HTML.="";
+				$HTML.="";
+				$HTML.="";
+				$HTML.="\n";
 			}
 		}
 		$carrier_rpt.="+----------------------+---------------------+-----------------+-----------+--------------+-------------+------------------------------------------+-----------+---------------+--------------+--------------+--------------------------------+\n";
 
 		$carrier_rpt_hf="";
 		$ll=$lower_limit-1000;
+		$HTML.="";
 		if ($ll>=1) {
 			$carrier_rpt_hf.="[<<< "._QXZ("PREV")." 1000 "._QXZ("records")."]";
+			$HTML.="";
 		} else {
 			$carrier_rpt_hf.=sprintf("%-23s", " ");
+			$HTML.="";
 		}
 		$carrier_rpt_hf.=sprintf("%-145s", " ");
 		if (($lower_limit+1000)=mysqli_num_rows($rpt_rslt)) {$max_limit=mysqli_num_rows($rpt_rslt)-$upper_limit;} else {$max_limit=1000;}
 			$carrier_rpt_hf.="["._QXZ("NEXT")." $max_limit "._QXZ("records")." >>>]";
+			$HTML.="";
 		} else {
 			$carrier_rpt_hf.=sprintf("%23s", " ");
+			$HTML.="";
 		}
 		$carrier_rpt_hf.="\n";
-		$MAIN.=$carrier_rpt_hf.$carrier_rpt.$carrier_rpt_hf;
+		$TEXT.=$carrier_rpt_hf.$carrier_rpt.$carrier_rpt_hf;
+		$HTML.="
"._QXZ("CARRIER LOG RECORDS FOR")." $query_date, $query_date_D "._QXZ("TO")." $query_date_T $server_rpt_string, $HC_rpt_string, $DS_rpt_string\n --- "._QXZ("RECORDS")." #$lower_limit-$upper_limit["._QXZ("DOWNLOAD")."]
"._QXZ("UNIQUE ID").""._QXZ("CALL DATE").""._QXZ("SERVER IP").""._QXZ("LEAD ID").""._QXZ("HANGUP CAUSE").""._QXZ("DIAL STATUS").""._QXZ("CHANNEL").""._QXZ("DIAL TIME").""._QXZ("ANSWERED TIME").""._QXZ("PHONE NUMBER").""._QXZ("SIP RESPONSE").""._QXZ("SIP REASON")."
".$row["uniqueid"]."".$row["call_date"]."".$row["server_ip"]."".$row["lead_id"]."".$row["hangup_cause"]."".$row["dialstatus"]."".$row["channel"]."".$row["dial_time"]."".$row["answered_time"]."".$phone_number."".$row["sip_hangup_cause"]."".$row["sip_hangup_reason"]."
[<<< "._QXZ("PREV")." 1000 "._QXZ("records")."] ["._QXZ("NEXT")." $max_limit "._QXZ("records")." >>>] 
";
+
 	} else {
-		$MAIN.="*** "._QXZ("NO RECORDS FOUND")." ***\n";
+		$TEXT.="*** "._QXZ("NO RECORDS FOUND")." ***\n";
+		$HTML.="*** "._QXZ("NO RECORDS FOUND")." ***\n";
+	}
+	$TEXT.="
\n";
+
+	if ($report_display_type=="HTML") {
+		$MAIN.=$HTML;
+	} else {
+		$MAIN.=$TEXT;
 	}
-	$MAIN.="
\n"; $MAIN.="\n"; diff --git a/agc_2-X/trunk/www/vicidial/AST_user_group_hourly_detail.php b/agc_2-X/trunk/www/vicidial/AST_user_group_hourly_detail.php index cbd29a47..b3810c5e 100644 --- a/agc_2-X/trunk/www/vicidial/AST_user_group_hourly_detail.php +++ b/agc_2-X/trunk/www/vicidial/AST_user_group_hourly_detail.php @@ -10,7 +10,6 @@ # 160826-0054 - First build # 170409-1542 - Added IP List validation code # 170816-2026 - Added HTML formatting -# 170818-0748 - Added link to v2 of report # $startMS = microtime(); @@ -387,8 +386,8 @@ $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($stmt, $link); - $qm_conf_ct = mysqli_num_rows($rslt); + $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); @@ -687,22 +686,17 @@ echo "\n"; echo "\n"; echo "\n"; -#echo "Display as:
"; -#echo "\n

"; + +echo _QXZ("Display as:")."
"; +echo "\n

"; if ($archives_available=="Y") { echo ""._QXZ("Search archived data")."\n"; } -echo "

"._QXZ("Display as:")."
"; -echo "\n

"; - - echo "

\n"; echo "         "; diff --git a/agc_2-X/trunk/www/vicidial/AST_user_group_hourly_detail_v2.php b/agc_2-X/trunk/www/vicidial/AST_user_group_hourly_detail_v2.php index 229c9d0c..8a10db5e 100644 --- a/agc_2-X/trunk/www/vicidial/AST_user_group_hourly_detail_v2.php +++ b/agc_2-X/trunk/www/vicidial/AST_user_group_hourly_detail_v2.php @@ -381,8 +381,8 @@ $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($stmt, $link); - $qm_conf_ct = mysqli_num_rows($rslt); + $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); @@ -569,7 +569,7 @@ if ($SUBMIT && $query_date && $start_hour && $end_hour) { foreach($hour_array as $hour){ if($allData[$Ugroup][$hour]) {sort($allData[$Ugroup][$hour]);} } - reset($hour_array); + if ($hour_array) {reset($hour_array);} for($cont=0; $cont < $maxUserByUserGroup[$Ugroup] ;$cont ++){ $ASCII_text.="| ".sprintf("%20s", $Ugroup)." |" ; @@ -597,7 +597,7 @@ if ($SUBMIT && $query_date && $start_hour && $end_hour) { $UG_ct++; } - reset($hour_array); + if ($hour_array) {reset($hour_array);} $ASCII_text.=$ASCII_header."\n"; $ASCII_text.=$ASCII_total."\n"; $ASCII_text.=$ASCII_header."\n"; diff --git a/agc_2-X/trunk/www/vicidial/AST_usergroup_login_report.php b/agc_2-X/trunk/www/vicidial/AST_usergroup_login_report.php index 31290f53..c715dd23 100644 --- a/agc_2-X/trunk/www/vicidial/AST_usergroup_login_report.php +++ b/agc_2-X/trunk/www/vicidial/AST_usergroup_login_report.php @@ -305,6 +305,46 @@ else $user_group_SQL = preg_replace('/,$/i', '',$user_group_SQL); #$user_group_SQL = "and vicidial_agent_log.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
";} @@ -360,29 +400,29 @@ $HTML_text.="\n"; $HTML_text.="\n"; $HTML_text.="\n"; -#$HTML_text.="Display as:
"; -#$HTML_text.="\n

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

"; if ($archives_available=="Y") { $HTML_text.=""._QXZ("Search archived data")."\n"; } -$HTML_text.="

\n"; -$HTML_text.="         "; +$HTML_text.="         "; $HTML_text.="          \n"; $HTML_text.=""._QXZ("DOWNLOAD")." |"; $HTML_text.=" "._QXZ("REPORTS")." \n"; $HTML_text.="\n"; +$HTML_text.="

\n"; $HTML_text.=""; -$HTML_text.="
\n";
+$HTML_text.="\n";
 
 	if ($file_download < 1)
 		{
-		$ASCII_text.=_QXZ("Usergroup Login Report",24).": $user                     $NOW_TIME ($db_source)\n";
+		$ASCII_text.="
"._QXZ("Usergroup Login Report",24).": $user                     $NOW_TIME ($db_source)\n";
 		$GRAPH_text.=_QXZ("Usergroup Login Report Report",24).": $user                     $NOW_TIME ($db_source)\n";
 		}
 	else
@@ -396,6 +436,26 @@ if ($SUBMIT)
 	$ASCII_text.="| "._QXZ("USER NAME",30)." | "._QXZ("ID",8)." | "._QXZ("USER GROUP",20)." | "._QXZ("FIRST LOGIN DATE",19)." | "._QXZ("LAST LOGIN DATE",19)." | "._QXZ("CAMPAIGN",8)." | "._QXZ("SERVER IP",15)." | "._QXZ("COMPUTER IP",15)." | "._QXZ("EXTENSION",20)." | "._QXZ("BROWSER",12)." | "._QXZ("PHONE LOGIN",15)." | "._QXZ("SERVER PHONE",15)." | "._QXZ("PHONE IP",15)." |\n";
 	$ASCII_text.="+--------------------------------+----------+----------------------+---------------------+---------------------+----------+-----------------+-----------------+----------------------+--------------+-----------------+-----------------+-----------------+\n";
 
+	$HTML_text2.="";
+	$HTML_text2.="";
+	$HTML_text2.="";
+	$HTML_text2.="\n";
+	$HTML_text2.="";
+	$HTML_text2.="";
+	$HTML_text2.="";
+	$HTML_text2.="";
+	$HTML_text2.="";
+	$HTML_text2.="";
+	$HTML_text2.="";
+	$HTML_text2.="";
+	$HTML_text2.="";
+	$HTML_text2.="";
+	$HTML_text2.="";
+	$HTML_text2.="";
+	$HTML_text2.="";
+	$HTML_text2.="";
+	$HTML_text2.="\n";
+
 	$CSV_text="\""._QXZ("User group login report")."\",\""._QXZ("User groups").":\",\""._QXZ("$user_group_string")."\"\n\n";
 	$CSV_text.="\""._QXZ("User name")."\",\""._QXZ("User ID")."\",\""._QXZ("User group")."\",\""._QXZ("First login date")."\",\""._QXZ("Last login date")."\",\""._QXZ("Campaign ID")."\",\""._QXZ("Server IP")."\",\""._QXZ("Computer IP")."\",\""._QXZ("Extension")."\",\""._QXZ("Browser")."\",\""._QXZ("Phone login")."\",\""._QXZ("Server phone")."\",\""._QXZ("Phone IP")."\"\n";
 	$stmt="select distinct user, substr(full_name,1,30) as fullname, full_name from vicidial_users where user_group in ($user_group_SQL) order by user";
@@ -414,9 +474,26 @@ if ($SUBMIT)
 			$browser=$browser_ary[0];
 			$ASCII_text.="| ".sprintf("%-30s", $row["fullname"])." | ".sprintf("%-8s", $row["user"])." | ".sprintf("%-20s", $data_row["user_group"])." | ".sprintf("%-19s", $date_row["min_date"])." | ".sprintf("%-19s", $date_row["max_date"])." | ".sprintf("%-8s", $data_row["campaign_id"])." | ".sprintf("%-15s", $data_row["server_ip"])." | ".sprintf("%-15s", $data_row["computer_ip"])." | ".sprintf("%-20s", $data_row["ext"])." | ".sprintf("%-12s", $browser)." | ".sprintf("%-15s", $data_row["phone_login"])." | ".sprintf("%-15s", $data_row["server_phone"])." | ".sprintf("%-15s", $data_row["phone_ip"])." |\n";
 			$CSV_text.="\"$row[full_name]\",\"$row[user]\",\"$data_row[user_group]\",\"$date_row[min_date]\",\"$date_row[max_date]\",\"$data_row[campaign_id]\",\"$data_row[server_ip]\",\"$data_row[computer_ip]\",\"$data_row[extension]\",\"$data_row[browser]\",\"$data_row[phone_login]\",\"$data_row[server_phone]\",\"$data_row[phone_ip]\"\n";
+
+			$HTML_text2.="";
+			$HTML_text2.="";
+			$HTML_text2.="";
+			$HTML_text2.="";
+			$HTML_text2.="";
+			$HTML_text2.="";
+			$HTML_text2.="";
+			$HTML_text2.="";
+			$HTML_text2.="";
+			$HTML_text2.="";
+			$HTML_text2.="";
+			$HTML_text2.="";
+			$HTML_text2.="";
+			$HTML_text2.="";
+			$HTML_text2.="\n";
 			}
 		}
 	$ASCII_text.="+--------------------------------+----------+----------------------+---------------------+---------------------+----------+-----------------+-----------------+----------------------+--------------+-----------------+-----------------+-----------------+\n";
+	$HTML_text2.="
"._QXZ("Usergroup Login Report Report").": $user$NOW_TIME ($db_source)
"._QXZ("USER NAME").""._QXZ("ID").""._QXZ("USER GROUP").""._QXZ("FIRST LOGIN DATE").""._QXZ("LAST LOGIN DATE").""._QXZ("CAMPAIGN").""._QXZ("SERVER IP").""._QXZ("COMPUTER IP").""._QXZ("EXTENSION").""._QXZ("BROWSER").""._QXZ("PHONE LOGIN").""._QXZ("SERVER PHONE").""._QXZ("PHONE IP")."
".$row["fullname"]."".$row["user"]."".$data_row["user_group"]."".$date_row["min_date"]."".$date_row["max_date"]."".$data_row["campaign_id"]."".$data_row["server_ip"]."".$data_row["computer_ip"]."".$data_row["ext"]."".$browser."".$data_row["phone_login"]."".$data_row["server_phone"]."".$data_row["phone_ip"]."
\n";
 	}
 
 if ($file_download>0) 
@@ -450,6 +527,10 @@ else
 		{
 		$HTML_text.=$GRAPH_text;
 		}
+	else if ($report_display_type=="HTML")
+		{
+		$HTML_text.=$HTML_text2;
+		}
 	else
 		{
 		$HTML_text.=$ASCII_text."
";
diff --git a/agc_2-X/trunk/www/vicidial/AST_webserver_url_report.php b/agc_2-X/trunk/www/vicidial/AST_webserver_url_report.php
index 22d0180c..0dc0cf36 100644
--- a/agc_2-X/trunk/www/vicidial/AST_webserver_url_report.php
+++ b/agc_2-X/trunk/www/vicidial/AST_webserver_url_report.php
@@ -8,6 +8,7 @@
 # 141114-0057 - Finalized adding QXZ translation to all admin files
 # 141230-1352 - Added code for on-the-fly language translations display
 # 170409-1534 - Added IP List validation code
+# 170818-2130 - Added HTML format
 #
 
 $startMS = microtime();
@@ -266,8 +267,6 @@ else
 	}
 if (strlen($webserver_SQL)<3) {$webserver_SQL="";}
 
-## JOEJ
-
 $url_string='|';
 $url_ct = count($url);
 $i=0;
@@ -329,6 +328,45 @@ if (strlen($url_SQL)>0) {
 	$login_url_SQL="and login_url in ($url_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];
+		}
+	}
+
 $HEADER.="\n";
 $HEADER.="\n";
 $HEADER.="