diff --git a/agc_2-X/branches/agc_2.0.4/extras/phone_codes_GMT.txt b/agc_2-X/branches/agc_2.0.4/extras/phone_codes_GMT.txt index 59b50913..d423d457 100644 --- a/agc_2-X/branches/agc_2.0.4/extras/phone_codes_GMT.txt +++ b/agc_2-X/branches/agc_2.0.4/extras/phone_codes_GMT.txt @@ -152,6 +152,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE PHP 1 USA 464 IL -6 Y SSM-FSN Illinois CST America/Chicago 1 USA 469 TX -6 Y SSM-FSN Texas CST America/Chicago 1 USA 470 GA -5 Y SSM-FSN Georgia EST America/New_York +1 USA 472 NC -5 Y SSM-FSN North Carolina EST America/New_York 1 GRD 473 -4 N Grenada AST America/Grenada 1 CAN 474 SK -6 N Saskatchewan CST America/Regina 1 USA 475 CT -5 Y SSM-FSN Connecticut EST America/New_York @@ -430,6 +431,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE PHP 1 USA 978 MA -5 Y SSM-FSN Massachusetts EST America/New_York 1 USA 979 TX -6 Y SSM-FSN Texas CST America/Chicago 1 USA 980 NC -5 Y SSM-FSN North Carolina EST America/New_York +1 USA 983 CO -7 Y SSM-FSN Colorado MST America/Denver 1 USA 984 NC -5 Y SSM-FSN North Carolina EST America/New_York 1 USA 985 LA -6 Y SSM-FSN Louisiana CST America/Chicago 1 USA 986 ID -7 Y SSM-FSN Idaho MST America/Denver 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 726ab2e4..379377dc 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 @@ -447,7 +447,7 @@ if ($SUBMIT) while ($data_row=mysqli_fetch_array($data_rslt)) { preg_match('/^[^\s]+/', $data_row["browser"], $browser_ary); - $browser=$browser_ary[0]; + if ($report_display_type=="TEXT") {$browser=$browser_ary[0];} else {$browser=$data_row["browser"];} $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"; diff --git a/agc_2-X/trunk/www/vicidial/callerID_log_report.php b/agc_2-X/trunk/www/vicidial/callerID_log_report.php index e745a20a..63e42332 100644 --- a/agc_2-X/trunk/www/vicidial/callerID_log_report.php +++ b/agc_2-X/trunk/www/vicidial/callerID_log_report.php @@ -405,7 +405,10 @@ if ($SUBMIT) $CID["$caller_id"][1]++; $log_calls++; } - else {print "$status not in $status_string
\n";} + else + { + if ($DB) {print "$status not in $status_string
\n";} + } } }