From 450ad4f9941a773ec3f6b522e3e9bd67f01e2d7d Mon Sep 17 00:00:00 2001
From: userjack6880 <john@systemanomaly.com>
Date: Fri, 12 Jul 2019 08:09:02 -0500
Subject: [PATCH 1/8] added hosts link to domain, added ability to sort by
 DMARC policy to index

---
 CHANGELOG.md           | 33 +++++++++++++++++++++++++++++++++
 README.md              | 33 ++++++---------------------------
 includes/functions.php |  2 +-
 index.php              |  2 +-
 4 files changed, 41 insertions(+), 29 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..6e08ce7
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,33 @@
+# Changelog
+
+## 0-α6
+- Sort index by DMARC policy added.
+- Link to domain page from senders page.
+
+## 0-α5
+- Fixed behavior of the control that changes the start of the display period to take in account the default date range configured in `config.php`.
+- Created the beginnings of the org reports page. It's kinda basic right now.
+- Added a bit of color to the DKIM and SPF result columns.
+- Added optional GeoIP2 Information on `hosts.php`.
+- Fixed a bunch of little things here and there, and added a few comments in areas that needed it.
+- Many thanks to Timo N. for making excellent suggestions on improving this project, pointing out things I would've overlooked long into it.
+
+## 0-α4
+- Added a control to change the start of the display period in 1 week steps.
+- Added disposition control to display a single disposition only.
+- Added a sender report to show senders for a single domain or what domains a single sender sent as.
+- Some code cleanup.
+
+## 0-α3
+
+- Fixed issue where a domain will be listed to have a non-zero volume, but on the domain page will have no reports. This page now properly shows all reports related to a single domain.
+- Improved the accuracy of the DMARC compliance graph. No longer does it take the larger of the two alignments, but instead counts a message as complaint if it is either DKIM or SPF aligned.
+- Moved away from mysqli to utilize PDO instead.
+
+## 0-α2
+
+- Code now has most useful features now.
+
+## 0-α1
+
+- Project started. It's absolutely terrible and nobody should use this.
diff --git a/README.md b/README.md
index 86a3c53..1621219 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Open DMARC Analyzer
 
-This is Open DMARC Analyzer version 0 alpha-5 (0-α5) by John Bradley (john@systemanomaly.com). Open DMARC Analyzer is an Open Source DMARC Report Analyzer to be used with DMARC reports that have been parsed by [John Levine's rrdmarc script](http://www.taugh.com/rddmarc/) or [techsneeze's dmarcts-report-parser](https://github.com/techsneeze/dmarcts-report-parser).
+This is Open DMARC Analyzer version 0 alpha-6 (0-α6) by John Bradley (john@systemanomaly.com). Open DMARC Analyzer is an Open Source DMARC Report Analyzer to be used with DMARC reports that have been parsed by [John Levine's rrdmarc script](http://www.taugh.com/rddmarc/) or [techsneeze's dmarcts-report-parser](https://github.com/techsneeze/dmarcts-report-parser).
 
 Open DMARC Analyzer was written because there didn't seem to be a full-featured self-hosted report analyzer that provided enough details to make heads or tails of a large volume of DMARC reports that come into medium to large-sized organizations. While other solutions required paid subscriptions or have part of it hosted on AWS, Open DMARC Analyzer will run on any webserver that supports PHP 5.4+ and MySQL 15.1+.
 
@@ -16,35 +16,14 @@ You will also need the GeoLite2 database from MaxMind (or any other compatible D
 
 The MaxMind library is not distributed with this project, and is ultimately an optional feature to the project as a whole.
 
-# Changelog
+# Latest Changes
 
-## 0-α5
-- Fixed behavior of the control that changes the start of the display period to take in account the default date range configured in `config.php`.
-- Created the beginnings of the org reports page. It's kinda basic right now.
-- Added a bit of color to the DKIM and SPF result columns.
-- Added optional GeoIP2 Information on `hosts.php`.
-- Fixed a bunch of little things here and there, and added a few comments in areas that needed it.
-- Many thanks to Timo N. for making excellent suggestions on improving this project, pointing out things I would've overlooked long into it.
+## 0-α6
 
-## 0-α4
-- Added a control to change the start of the display period in 1 week steps.
-- Added disposition control to display a single disposition only.
-- Added a sender report to show senders for a single domain or what domains a single sender sent as.
-- Some code cleanup.
+- Sort index by DMARC policy added.
+- Link to domain page from senders page.
 
-## 0-α3
-
-- Fixed issue where a domain will be listed to have a non-zero volume, but on the domain page will have no reports. This page now properly shows all reports related to a single domain.
-- Improved the accuracy of the DMARC compliance graph. No longer does it take the larger of the two alignments, but instead counts a message as complaint if it is either DKIM or SPF aligned.
-- Moved away from mysqli to utilize PDO instead.
-
-## 0-α2
-
-- Code now has most useful features now.
-
-## 0-α1
-
-- Project started. It's absolutely terrible and nobody should use this.
+See `CHANGELOG.md` for full details of all changes.
 
 # License
 
diff --git a/includes/functions.php b/includes/functions.php
index a6f58f0..2962a1b 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -332,7 +332,7 @@ function senders_report_table($pdo, $dateRange = DATE_RANGE, $domain = null, $ip
 		echo "\t<tr>\n";
 		echo "\t\t<td>".long2ip($row['ip'])."</td>\n";
 		echo "\t\t<td>".gethostbyaddr(long2ip($row['ip']))."</td>\n";
-		echo "\t\t<td>".$row['identifier_hfrom']."</td>\n";
+		echo "\t\t<td><a href='domain.php?domain=".$row['identifier_hfrom']."'>".$row['identifier_hfrom']."</a></td>\n";
 		echo "\t</tr>\n";
 	}
 
diff --git a/index.php b/index.php
index f08f146..31da88c 100644
--- a/index.php
+++ b/index.php
@@ -42,7 +42,7 @@
 ?>
 
 <script>
-	var TSort_Data = new Array('compliance_table','s','i','','i','i','i');
+	var TSort_Data = new Array('compliance_table','s','i','s','i','i','i');
 	var TSort_Cookie = 'compliance_table';
 	var TSort_NColumns = 1;
 	tsRegister();

From 316522ddb6ce5584c0bf6b9e73660f0e3952ee1c Mon Sep 17 00:00:00 2001
From: userjack6880 <john@systemanomaly.com>
Date: Fri, 12 Jul 2019 08:32:10 -0500
Subject: [PATCH 2/8] trying to fix what policy gets displayed

---
 includes/functions.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/includes/functions.php b/includes/functions.php
index 2962a1b..cf28267 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -81,6 +81,8 @@ function dmarc_data($pdo, $rdata, $domain = NULL, $disp = 'none') {
 		array_push($serials, $data['serial']);
 	}
 
+	$policy = end($rdata); // move internal point to end of array to get policy data
+
 	// parameters are different based on if the domain is set
 	if (isset($domain)) {
 		$params = array(':domain' => "$domain", ':disp' => $disp);
@@ -106,8 +108,8 @@ function dmarc_data($pdo, $rdata, $domain = NULL, $disp = 'none') {
 			$counts[$id]->alignDKIM  = 0;
 			$counts[$id]->alignSPF   = 0;
 			$counts[$id]->compliance = 0;
-			$counts[$id]->policy     = $data['policy_p'];
-			$counts[$id]->policyPct  = $data['policy_pct'];
+			$counts[$id]->policy     = $policy['policy_p'];
+			$counts[$id]->policyPct  = $policy['policy_pct'];
 			$counts[$id]->reports    = [];
 		}
 		$counts[$id]->numReport++;

From e9fa7e47f71d4fcda4ea286f0a3fad1f2ffbfe57 Mon Sep 17 00:00:00 2001
From: userjack6880 <john@systemanomaly.com>
Date: Fri, 12 Jul 2019 08:34:02 -0500
Subject: [PATCH 3/8] trying to fix what policy gets displayed

---
 includes/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/functions.php b/includes/functions.php
index cf28267..fecfdfc 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -81,7 +81,7 @@ function dmarc_data($pdo, $rdata, $domain = NULL, $disp = 'none') {
 		array_push($serials, $data['serial']);
 	}
 
-	$policy = end($rdata); // move internal point to end of array to get policy data
+	$policy = reset($rdata); // move internal point to end of array to get policy data
 
 	// parameters are different based on if the domain is set
 	if (isset($domain)) {

From 840def0c33451ad8bce79bd0d15ac07a28d8dc97 Mon Sep 17 00:00:00 2001
From: userjack6880 <john@systemanomaly.com>
Date: Fri, 12 Jul 2019 08:47:27 -0500
Subject: [PATCH 4/8] trying to fix what policy gets displayed

---
 includes/functions.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/includes/functions.php b/includes/functions.php
index fecfdfc..a175431 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -75,14 +75,16 @@ function dmarc_data($pdo, $rdata, $domain = NULL, $disp = 'none') {
 
 	$counts = [];
 	$serials = [];
+	$policy = [];
 
 	// extract the serial numbers from the array given and push into an array of just serial numbers
+	// additionally, pair serial numbers with their policies
 	foreach ($rdata as $data) {
 		array_push($serials, $data['serial']);
+		$policy[$data['serial'].'_p'] = $data['policy_p'];
+		$policy[$data['serial'].'_pct'] = $data['policy_pct'];
 	}
 
-	$policy = reset($rdata); // move internal point to end of array to get policy data
-
 	// parameters are different based on if the domain is set
 	if (isset($domain)) {
 		$params = array(':domain' => "$domain", ':disp' => $disp);
@@ -108,12 +110,14 @@ function dmarc_data($pdo, $rdata, $domain = NULL, $disp = 'none') {
 			$counts[$id]->alignDKIM  = 0;
 			$counts[$id]->alignSPF   = 0;
 			$counts[$id]->compliance = 0;
-			$counts[$id]->policy     = $policy['policy_p'];
-			$counts[$id]->policyPct  = $policy['policy_pct'];
+			$counts[$id]->policy     = $policy[$row['serial'].'_p'];
+			$counts[$id]->policyPct  = $policy[$row['serial']'_pct'];
 			$counts[$id]->reports    = [];
 		}
 		$counts[$id]->numReport++;
-		$counts[$id]->rcount += $row['rcount'];
+		$counts[$id]->rcount   += $row['rcount'];
+		$counts[$id]->policy    = $policy[$row['serial'].'_p'];
+		$counts[$id]->policyPct = $policy[$row['serial'].'_pct'];
 		if ($row['dkimresult'] == 'pass')   { $counts[$id]->resultDKIM++; }
 		if ($row['spfresult']  == 'pass')   { $counts[$id]->resultSPF++;  }
 		if ($row['dkim_align'] == 'pass')   { $counts[$id]->alignDKIM++;  }

From 1bd98c51d76340d5a5708d70462e089558a9d599 Mon Sep 17 00:00:00 2001
From: userjack6880 <john@systemanomaly.com>
Date: Fri, 12 Jul 2019 08:48:25 -0500
Subject: [PATCH 5/8] trying to fix what policy gets displayed

---
 includes/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/functions.php b/includes/functions.php
index a175431..3d7ff9b 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -111,7 +111,7 @@ function dmarc_data($pdo, $rdata, $domain = NULL, $disp = 'none') {
 			$counts[$id]->alignSPF   = 0;
 			$counts[$id]->compliance = 0;
 			$counts[$id]->policy     = $policy[$row['serial'].'_p'];
-			$counts[$id]->policyPct  = $policy[$row['serial']'_pct'];
+			$counts[$id]->policyPct  = $policy[$row['serial'].'_pct'];
 			$counts[$id]->reports    = [];
 		}
 		$counts[$id]->numReport++;

From 1c7bc537bc67d1d4b45f91f7d50d35f3edf47170 Mon Sep 17 00:00:00 2001
From: userjack6880 <john@systemanomaly.com>
Date: Fri, 12 Jul 2019 08:52:19 -0500
Subject: [PATCH 6/8] trying to fix what policy gets displayed

---
 includes/functions.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/includes/functions.php b/includes/functions.php
index 3d7ff9b..fc9224b 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -113,11 +113,16 @@ function dmarc_data($pdo, $rdata, $domain = NULL, $disp = 'none') {
 			$counts[$id]->policy     = $policy[$row['serial'].'_p'];
 			$counts[$id]->policyPct  = $policy[$row['serial'].'_pct'];
 			$counts[$id]->reports    = [];
+			$counts[$id]->lastSerial = $row['serial'];
 		}
 		$counts[$id]->numReport++;
-		$counts[$id]->rcount   += $row['rcount'];
-		$counts[$id]->policy    = $policy[$row['serial'].'_p'];
-		$counts[$id]->policyPct = $policy[$row['serial'].'_pct'];
+		$counts[$id]->rcount += $row['rcount'];
+		// check if current serial is bigger than what is stored
+		if ($row['serial'] > $counts[$id]->lastSerial) {
+			$counts[$id]->policy     = $policy[$row['serial'].'_p'];
+			$counts[$id]->policyPct  = $policy[$row['serial'].'_pct'];
+			$counts[$id]->lastSerial = $row['serial'];
+		}
 		if ($row['dkimresult'] == 'pass')   { $counts[$id]->resultDKIM++; }
 		if ($row['spfresult']  == 'pass')   { $counts[$id]->resultSPF++;  }
 		if ($row['dkim_align'] == 'pass')   { $counts[$id]->alignDKIM++;  }

From 4f7e298e296795bd08e19720aa7e7d05a88f0a8e Mon Sep 17 00:00:00 2001
From: userjack6880 <john@systemanomaly.com>
Date: Fri, 12 Jul 2019 08:54:27 -0500
Subject: [PATCH 7/8] trying to fix what policy gets displayed

---
 CHANGELOG.md | 1 +
 README.md    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e08ce7..c9de857 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 0-α6
 - Sort index by DMARC policy added.
 - Link to domain page from senders page.
+- Fixed policy listed on index.
 
 ## 0-α5
 - Fixed behavior of the control that changes the start of the display period to take in account the default date range configured in `config.php`.
diff --git a/README.md b/README.md
index 1621219..c939171 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@ The MaxMind library is not distributed with this project, and is ultimately an o
 
 - Sort index by DMARC policy added.
 - Link to domain page from senders page.
+- Fixed policy listed on index.
 
 See `CHANGELOG.md` for full details of all changes.
 

From d0e0469dd8116861b0fb6b057fcc727283ffe2e0 Mon Sep 17 00:00:00 2001
From: userjack6880 <john@systemanomaly.com>
Date: Fri, 21 Feb 2020 15:11:01 -0600
Subject: [PATCH 8/8] update for Alpha 6

---
 CHANGELOG.md                 |  1 +
 README.md                    |  6 ++++++
 config.php.pub               | 14 ++++++++------
 domain.php                   |  2 +-
 host.php                     |  2 +-
 includes.php                 |  2 +-
 includes/db.php              |  2 +-
 includes/functions.php       | 22 ++++++++++++++++++----
 includes/template-loader.php |  2 +-
 includes/template.php        |  4 ++--
 index.php                    |  2 +-
 org.php                      |  2 +-
 report.php                   |  2 +-
 templates/openda/footer.php  |  2 +-
 templates/openda/header.php  |  2 +-
 templates/openda/index.php   |  2 +-
 templates/openda/style.css   |  4 ++--
 17 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9de857..807582b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Sort index by DMARC policy added.
 - Link to domain page from senders page.
 - Fixed policy listed on index.
+- Added Organization Output
 
 ## 0-α5
 - Fixed behavior of the control that changes the start of the display period to take in account the default date range configured in `config.php`.
diff --git a/README.md b/README.md
index c939171..3280a53 100644
--- a/README.md
+++ b/README.md
@@ -6,12 +6,17 @@ Open DMARC Analyzer was written because there didn't seem to be a full-featured
 
 # Dependencies
 
+## Required - [jsmitty12/phpWhois](https://github.com/jsmitty12/phpWhois/)
+It is highly recommended that you install this package using composer. Instructions are found on the package's git page. This is required, and will replace most GeoIP data if you disable the MaxMind DB reader package.
+
 ## Optional - [MaxMind DB Reader PHP API](https://github.com/maxmind/MaxMind-DB-Reader-php)
 A note on this dependency - I've tried to write the one refrence to this external project as optional as possible, and it can almost completely be configured from config.php, due to the limitation of php namespace, I haven't come across a way that won't require you to dig deeper into the code if you happen to chose a compatible library to replace this MaxMind one. If you do wish to replace this library with another compatible one, the line in question is located in `includes\functions.php`:
 ```php
 $reader = new MaxMind\Db\Reader(GEO_DB);
 ```
 
+It is highly recommended that you install this package using composer. Instructions are found on the package's git page.
+
 You will also need the GeoLite2 database from MaxMind (or any other compatible DB). It can be obtained from [here](https://dev.maxmind.com/geoip/geoip2/geolite2/). Open DMARC Analyzer makes use of the GeoLite2 City database.
 
 The MaxMind library is not distributed with this project, and is ultimately an optional feature to the project as a whole.
@@ -23,6 +28,7 @@ The MaxMind library is not distributed with this project, and is ultimately an o
 - Sort index by DMARC policy added.
 - Link to domain page from senders page.
 - Fixed policy listed on index.
+- Added Organization Output.
 
 See `CHANGELOG.md` for full details of all changes.
 
diff --git a/config.php.pub b/config.php.pub
index 1278be2..8f843df 100644
--- a/config.php.pub
+++ b/config.php.pub
@@ -2,7 +2,7 @@
 /*
 Open DMARC Analyzer - Open Source DMARC Analyzer
 config.php
-2019 - John Bradley (userjack6880)
+2020 - John Bradley (userjack6880)
 
 Available at: https://github.com/userjack6880/Open-DMARC-Analyzer
 
@@ -25,22 +25,24 @@ this program.  If not, see <https://www.gnu.org/licenses/>.
 
 define('DB_HOST', 'localhost');
 define('DB_USER', 'dmarc');
-define('DB_PASS', '');
+define('DB_PASS', 'password');
 define('DB_NAME', 'dmarc');
 define('DB_PORT', '3306'); // default port 3306
 
 // Debug Settings
 
-define('DEBUG', 1);		// 0 - disable, 1 - CLI only, 2 - CLI and web
+define('DEBUG', 1);
 
 // Template Settings
 
 define('TEMPLATE', 'openda');
 
+// Package Loader
+define('AUTO_LOADER', 'vendor/autoload.php');	// autoloader for composer installed libraries
+
 // GeoIP2 Settings
-define('GEO_ENABLE', 0);	// 0 - disable GeoIP2, 1 - enable GeoIP2
-define('GEO_LOADER', '');	// autoloader for GeoIP2 library
-define('GEO_DB', '');			// location of GeoIP2 database
+define('GEO_ENABLE', 1);											// 0 - disable GeoIP2, 1 - enable GeoIP2
+define('GEO_DB', 'includes/geolite2.mmdb');		// location of GeoIP2 database
 
 // Defaults
 
diff --git a/domain.php b/domain.php
index 9ee85cb..e55ef51 100644
--- a/domain.php
+++ b/domain.php
@@ -2,7 +2,7 @@
 /*
 Open DMARC Analyzer - Open Source DMARC Analyzer
 domain.php
-2019 - John Bradley (userjack6880)
+2020 - John Bradley (userjack6880)
 
 Available at: https://github.com/userjack6880/Open DMARC Analyzer
 
diff --git a/host.php b/host.php
index 27f7698..da5c563 100644
--- a/host.php
+++ b/host.php
@@ -2,7 +2,7 @@
 /*
 Open DMARC Analyzer - Open Source DMARC Analyzer
 host.php
-2019 - John Bradley (userjack6880)
+2020 - John Bradley (userjack6880)
 
 Available at: https://github.com/userjack6880/Open DMARC Analyzer
 
diff --git a/includes.php b/includes.php
index 7c6c39b..93a13c8 100644
--- a/includes.php
+++ b/includes.php
@@ -2,7 +2,7 @@
 /*
 Open DMARC Analyzer - Open Source DMARC Analyzer
 include.php
-2019 - John Bradley (userjack6880)
+2020 - John Bradley (userjack6880)
 
 Available at: https://github.com/userjack6880/Open-DMARC-Analyzer
 
diff --git a/includes/db.php b/includes/db.php
index 312c776..6b7d20f 100644
--- a/includes/db.php
+++ b/includes/db.php
@@ -2,7 +2,7 @@
 /*
 Open DMARC Analyzer - Open Source DMARC Analyzer
 includes/db.php
-2019 - John Bradley (userjack6880)
+2020 - John Bradley (userjack6880)
 
 Available at: https://github.com/userjack6880/Open-DMARC-Analyzer
 
diff --git a/includes/functions.php b/includes/functions.php
index fc9224b..4c9091b 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -2,7 +2,7 @@
 /*
 Open DMARC Analyzer - Open Source DMARC Analyzer
 includes/functions.php
-2019 - John Bradley (userjack6880)
+2020 - John Bradley (userjack6880)
 
 Available at: https://github.com/userjack6880/Open-DMARC-Analyzer
 
@@ -298,23 +298,37 @@ function senders_report_info($ip = null) {
 	// if no IP is given, don't bother with anything
 	if (!isset($ip)) { return; }
 	// if GeoIP2 is disabled, don't bother with anything
-	elseif(!GEO_ENABLE) { return; }
+	elseif(!GEO_ENABLE) { 
+		echo "<h2>WHOIS Info for $ip</h2>\n";
+
+		require_once(AUTO_LOADER);
+
+		$whois = new phpWhois\Whois();
+		$result = $whois->lookup($ip,false);
+
+		echo "Organization: ".$result['regrinfo']['owner']['organization']."<br>\n";
+		echo "Hostname: ".gethostbyaddr($ip)."</td>\n";
+
+	}
 	// otherwise, let's get started with this
 	else {
 		echo "<h2>GeoIP Info for $ip</h2>\n";
 
-		require_once(GEO_LOADER); 
+		require_once(AUTO_LOADER); 
 
 		$reader = new MaxMind\Db\Reader(GEO_DB);
 
 		$data = $reader->get($ip);
 
+		$whois = new phpWhois\Whois();
+		$result = $whois->lookup($ip,false);
+
+		echo "Organization: ".$result['regrinfo']['owner']['organization']."<br>\n";
 		echo "City: ".$data['city']['names']['en']."<br>\n";
 		echo "Region: ".$data['subdivisions']['0']['names']['en']."<br>\n";
 		echo "Country: ".$data['country']['names']['en']."<br>\n";
 		echo "Location: ".$data['location']['latitude'].",".$data['location']['longitude']."<br>\n";
 		echo "Hostname: ".gethostbyaddr($ip)."</td>\n";
-		debug(str_replace(array('&lt;?php&nbsp;','?&gt;'), '', highlight_string( '<?php ' .     var_export($data, true) . ' ?>', true ) ));
 
 		$reader->close();
 	}
diff --git a/includes/template-loader.php b/includes/template-loader.php
index 1f4eb38..b8248fb 100644
--- a/includes/template-loader.php
+++ b/includes/template-loader.php
@@ -2,7 +2,7 @@
 /*
 Open DMARC Analyzer - Open Source DMARC Analyzer
 includes/template-loader.php
-2019 - John Bradley (userjack6880)
+2020 - John Bradley (userjack6880)
 
 Available at: https://github.com/userjack6880/Open-DMARC-Analyzer
 
diff --git a/includes/template.php b/includes/template.php
index 3fe1f9a..b096b67 100644
--- a/includes/template.php
+++ b/includes/template.php
@@ -2,7 +2,7 @@
 /*
 Open DMARC Analyzer - Open Source DMARC Analyzer
 ncludes/template.php
-2019 - John Bradley (userjack6880)
+2020 - John Bradley (userjack6880)
 
 Available at: https://github.com/userjack6880/Open-DMARC-Analyzer
 
@@ -23,7 +23,7 @@
 
 // Versioning
 function oda_version() {
-	echo "0-&alpha;5";
+	echo "0-&alpha;6";
 }
 
 // General Page Templates
diff --git a/index.php b/index.php
index 31da88c..bc91c85 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 /*
 Open DMARC Analyzer - Open Source DMARC Analyzer
 index.php
-2019 - John Bradley (userjack6880)
+2020 - John Bradley (userjack6880)
 
 Available at: https://github.com/userjack6880/Open DMARC Analyzer
 
diff --git a/org.php b/org.php
index 30ed3cc..db88f02 100644
--- a/org.php
+++ b/org.php
@@ -2,7 +2,7 @@
 /*
 Open DMARC Analyzer - Open Source DMARC Analyzer
 org.php
-2019 - John Bradley (userjack6880)
+2020 - John Bradley (userjack6880)
 
 Available at: https://github.com/userjack6880/Open DMARC Analyzer
 
diff --git a/report.php b/report.php
index 8b40481..67a2ddc 100644
--- a/report.php
+++ b/report.php
@@ -2,7 +2,7 @@
 /*
 Open DMARC Analyzer - Open Source DMARC Analyzer
 report.php
-2019 - John Bradley (userjack6880)
+2020 - John Bradley (userjack6880)
 
 Available at: https://github.com/userjack6880/Open DMARC Analyzer
 
diff --git a/templates/openda/footer.php b/templates/openda/footer.php
index 6248ecd..cd79b31 100644
--- a/templates/openda/footer.php
+++ b/templates/openda/footer.php
@@ -2,7 +2,7 @@
 /*
 Open DMARC Analyzer - Open Source DMARC Analyzer
 templates/openda/footer.php
-2019 - John Bradley (userjack6880)
+2020 - John Bradley (userjack6880)
 
 Available at: https://github.com/userjack6880/Open-DMARC-Analyzer
 
diff --git a/templates/openda/header.php b/templates/openda/header.php
index 664ca54..07a4c20 100644
--- a/templates/openda/header.php
+++ b/templates/openda/header.php
@@ -2,7 +2,7 @@
 /*
 Open DMARC Analyzer - Open Source DMARC Analyzer
 templates/openda/header.php
-2019 - John Bradley (userjack6880)
+2020 - John Bradley (userjack6880)
 
 Available at: https://github.com/userjack6880/Open-DMARC-Analyzer
 
diff --git a/templates/openda/index.php b/templates/openda/index.php
index e2a8fb3..1b0753c 100644
--- a/templates/openda/index.php
+++ b/templates/openda/index.php
@@ -2,7 +2,7 @@
 /*
 Open DMARC Analyzer - Open Source DMARC Analyzer
 templates/openda/index.php
-2019 - John Bradley (userjack6880)
+2020 - John Bradley (userjack6880)
 
 Available at: https://github.com/userjack6880/Open-DMARC-Analyzer
 
diff --git a/templates/openda/style.css b/templates/openda/style.css
index a2e4c61..5e0adef 100644
--- a/templates/openda/style.css
+++ b/templates/openda/style.css
@@ -1,7 +1,7 @@
 /*
 Open DMARC Analyzer - Open Source DMARC Analyzer
-templates/openda/index.php
-2019 - John Bradley (userjack6880)
+templates/openda/style.css
+2020 - John Bradley (userjack6880)
 
 Available at: https://github.com/userjack6880/Open-DMARC-Analyzer