Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix #65

Merged
merged 2 commits into from
Nov 4, 2022
Merged

Bugfix #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5aeb1e
Merge pull request #64 from userjack6880/dev
userjack6880 Nov 4, 2022
94a807d
bugfix for issue #61
Nov 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ Valid date signifiers are `m`, `w`, and `d` for "month", "week", and "day".
# Latest Changes

## 1-β1
- Corrected a geoip/whois bug (thank you [volkermauel](https://github.com/userjack6880/Open-DMARC-Analyzer/commits?author=volkermauel))
- Corrected a geoip/whois bug (thank you [volkermauel](https://github.com/userjack6880/Open-DMARC-Analyzer/commits?author=volkermauel)).
- Corrected template formatting bug with GEOIP disabled.

See `CHANGELOG` under `docs` for full details of all changes.

Expand Down
3 changes: 2 additions & 1 deletion docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Changelog

## 1-β1
- Corrected a geoip/whois bug (thank you [volkermauel](https://github.com/userjack6880/Open-DMARC-Analyzer/commits?author=volkermauel))
- Corrected a geoip/whois bug (thank you [volkermauel](https://github.com/userjack6880/Open-DMARC-Analyzer/commits?author=volkermauel)).
- Corrected template formatting bug with GEOIP disabled.

## 1-fc
- Documentation Updates
Expand Down
22 changes: 12 additions & 10 deletions includes/template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,14 +434,16 @@ function sender_details($geo_data, $stats, $domain, $dateRange, $ip) {
// present the data, obi-wan
if (GEO_ENABLE) {
echo "<div class=dov-bar style='margin-top: 0;height:400px;'>\n
<div class=dov-bar-in style='height:400px;'>\n";
<div class=dov-bar-in style='height:400px;'>\n
<div class=geo-left>\n
<div class=geo-left-inner>\n";
}
else {
echo "<div class=dov-bar style='margin-top: 0;height:100px;'>\n
<div class=dov-bar-in style='height:100px;'>\n";
<div class=dov-bar-in style='height:100px;'>\n
<div class=geo-left style='height:100px;'>\n
<div class=geo-left-inner>\n";
}
echo " <div class=geo-left>\n
<div class=geo-left-inner>\n";

if ($ip != '') { echo "$ip<br />\n"; }
if ($hostname != '') { echo "$hostname<br />\n"; }
Expand All @@ -452,18 +454,18 @@ function sender_details($geo_data, $stats, $domain, $dateRange, $ip) {

echo "<br />\n";

echo " </div>\n
</div>\n
<div class=geo-right>\n";
echo " </div>\n
</div>\n";

// if there's no maxmind data, then there's no map to find
if (GEO_ENABLE) {
echo "<iframe width='100%' height='100%' src='https://maps.google.com/maps?q=$lat,$lon&z=3&output=embed'></iframe>\n";
echo " <div class=geo-right>\n
<iframe width='100%' height='100%' src='https://maps.google.com/maps?q=$lat,$lon&z=3&output=embed'></iframe>\n
</div>\n";
}

echo " </div>\n
</div>\n
</div>\n";
</div>\n";

if (count($stats) > 0) {
echo "<table style='margin: 30px auto 0 auto' id='dmarc_reports' class='centered'>\n
Expand Down