Merge pull request #90 from userjack6880/version-1-breakfix

Version 1 GA

README.md

@@ -5,7 +5,7 @@ Open DMARC Analyzer is an Open Source DMARC Report Analyzer to be used with DMAR
 
 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 7.4+ and MySQL 15.1+.
 
-Open DMARC Analyzer Version 1 Release Candidate 1 (1-rc1) is an [Anomaly \<Codebase\>](https://systemanomaly.com/codebase) project by John Bradley (john@systemanomaly.com)
+Open DMARC Analyzer Version 1 is an [Anomaly \<Codebase\>](https://systemanomaly.com/codebase) project by John Bradley (john@systemanomaly.com)
 
 # Minimum Requirements
 - Apache 2 or equivalent
@@ -96,14 +96,6 @@ Defines the standard starting date range for data presented. All pages where dat
 
 Valid date signifiers are `m`, `w`, and `d` for "month", "week", and "day".
 
-# Latest Changes
-
-## 1-rc1
-- Documentation updates.
-- Carried forward backports from beta 4.
-
-See `CHANGELOG` under `docs` for full details of all changes.
-
 # Tested System Configurations
 
 | OS              | HTTP          | PHP    | SQL             |
@@ -118,17 +110,15 @@ If you have a system configuration not listed, and would like to contribue this
 
 # Release Cycle and Versioning
 
-This project regular release cycle is not yet determined. Versioning is under the Anomaly Versioning Scheme (2022), as outlined in `VERSIONING` under `docs`.
+At release, End of Support and End of Life will be determined based on what will be in the next version. Versioning is under the Anomaly Versioning Scheme (2022), as outlined in `VERSIONING` under `docs`.
 
 # Support
 
 Support will be provided as outlined in the following schedule. For more details, see `SUPPORT`.
 
-| Version                             | Support Level    | Released         | End of Support   | End of Life      |
-| ----------------------------------- | ---------------- | ---------------- | ---------------- | ---------------- |
-| Version 1 Release Candidate 1       | Full Support     | 28 April 2023    | 15 May 2023      | 31 December 2023 |
-| Version 1 Beta 4                    | Critical Support | 26 April 2023    | 28 April 2023    | 15 May 2023      |
-| Version 1 Beta 3                    | End of Life      | 19 April 2023    | 26 April 2023    | 28 April 2023    |
+| Version                             | Released         | End of Support   | End of Life      |
+| ----------------------------------- | ---------------- | ---------------- | ---------------- |
+| Version 1 (Stable)                  | 15 May 2023      | 15 May 2024      | 31 December 2024 |
 
 # Contributing
 

docs/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 1
+- Release!
+
 ## 1-rc1
 - Documentation updates.
 - Carried forward backports from beta 4.

docs/SECURITY.md

@@ -18,12 +18,13 @@ A response should be recieved within 72 hours. If no response is given, please f
 
 Open DMARC Analyzer Version Security Support
 
-| Version                       | Supported | End of Life      |
-| ----------------------------- | --------- | ---------------- |
-| Version 1 Release Candidate 1 | YES       | 31 December 2023 |
-| Version 1 Beta 4              | YES       | 28 April 2023    |
-| Version 1 Beta 3              | NO        | 15 May 2023      |
-| Version 1 Beta 2              | NO        | 26 April 2023    |
-| Version 1 Beta 1              | NO        | 19 April 2023    |
-| Version 1 Feature Complete    | NO        | 29 November 2022 |
-| Version 0 Alpha 9             | NO        | 4 November 2022  |
+| Version                       | End of Life      |
+| ----------------------------- | ---------------- |
+| Version 1                     | 31 December 2024 |
+| Version 1 Release Candidate 1 | 31 December 2023 |
+| Version 1 Beta 4              | 28 April 2023    |
+| Version 1 Beta 3              | 15 May 2023      |
+| Version 1 Beta 2              | 26 April 2023    |
+| Version 1 Beta 1              | 19 April 2023    |
+| Version 1 Feature Complete    | 29 November 2022 |
+| Version 0 Alpha 9             | 4 November 2022  |

docs/SUPPORT.md

@@ -2,30 +2,31 @@
 
 Due to the limited time available to developrs to maintain support, dates must be set where support must end. The following is a chart outlining the support shedule for Open DMARC Analyzer.
 
-| Version                             | Support Level    | Released         | End of Support   | End of Life      |
-| ----------------------------------- | ---------------- | ---------------- | ---------------- | ---------------- |
-| Version 1 Release Candidate 1       | Full Support     | 28 April 2023    | 15 May 2023      | 31 December 2023 |
-| Version 1 Beta 4                    | Critical Support | 26 April 2023    | 28 April 2023    | 15 May 2023      |
-| Version 1 Beta 3                    | End of Life      | 19 April 2023    | 26 April 2023    | 28 April 2023    |
-| Version 1 Beta 2                    | End of Life      | 29 November 2022 | 19 April 2023    | 26 April 2023    |
-| Version 1 Beta 1                    | End of Life      | 4 November 2022  | 29 November 2022 | 19 April 2023    |
-| Version 1 Feature Complete          | End of Life      | 27 July 2022     | 4 November 2022  | 29 November 2022 |
-| Version 0 Alpha 9                   | End of Life      | 2 May 2022       | 27 July 2022     | 4 November 2022  |
-| Version 0 Alpha 8.2                 | End of Life      | 31 March 2022    | 2 May 2022       | 27 July 2022     |
-| Version 0 Alpha 8.1                 | End of Life      | 30 March 2022    | 31 March 2022    | 2 May 2022       |
-| Version 0 Alpha 8 or Older          | End of Life      | 29 March 2022    | 30 March 2022    | 30 March 2022    |
+| Version                             | Released         | End of Support   | End of Life      |
+| ----------------------------------- | ---------------- | ---------------- | ---------------- |
+| Version 1 (Stable)                  | 15 May 2023      | 15 May 2024      | 31 December 2024 |
+| Version 1 Release Candidate 1       | 28 April 2023    | 15 May 2023      | 31 December 2023 |
+| Version 1 Beta 4                    | 26 April 2023    | 28 April 2023    | 15 May 2023      |
+| Version 1 Beta 3                    | 19 April 2023    | 26 April 2023    | 28 April 2023    |
+| Version 1 Beta 2                    | 29 November 2022 | 19 April 2023    | 26 April 2023    |
+| Version 1 Beta 1                    | 4 November 2022  | 29 November 2022 | 19 April 2023    |
+| Version 1 Feature Complete          | 27 July 2022     | 4 November 2022  | 29 November 2022 |
+| Version 0 Alpha 9                   | 2 May 2022       | 27 July 2022     | 4 November 2022  |
+| Version 0 Alpha 8.2                 | 31 March 2022    | 2 May 2022       | 27 July 2022     |
+| Version 0 Alpha 8.1                 | 30 March 2022    | 31 March 2022    | 2 May 2022       |
+| Version 0 Alpha 8 or Older          | 29 March 2022    | 30 March 2022    | 30 March 2022    |
 
 # Support Cycle
 
 - Pre-stable versions recieve one version cycle of full spport and one cycle of critical support before being considered end of life. Due to the lack of release cycle for these versions, support time can wildly vary.
 - The final release candidate will have critical support until the end of a year that the stable version is released.
 - All versions of a stable version are considered supported, though it is encouraged to keep updated to the latest stable release.
-- Stable versions reach end of life at the end of a year that a new stable version is released. The exception is LTS versions - those will recieve 3 years of support after a new stable version is released.
+- Stable versions reach end of life at the end of a year that a new stable version is released. The exception is LTS versions - those will recieve support until the end of a year after a new LTS version is released.
 
 # Support Levels
 
-- **Full Support** means that software will recieve regular bug fixes, feature updates (if applicable), and security fixes. All current versions do not have an expected End of Support or End of Life date, as new version releases are not always predictable.
+- **Full Support** means that software will recieve regular bug fixes, and security fixes until End of Support, at which time it falls under Critical Support.
 
-- **Critical Support** means that software will no longer recieve regular bug fixes or feature updates, but security fixes will still be provided.
+- **Critical Support** means that software will no longer recieve regular bug fixes, but security fixes will still be provided until End of Life.
 
-- **End of Life** means that there is no more support what-so-ever. Issues, bug reports, and code contributions to these versions will be ignored or rejected.
+- **End of Life** means that there is no more support what-so-ever. Issues, bug reports, and code contributions to these versions will be ignored, rejected, or referred to currently supported versions.

includes/template.php

@@ -31,7 +31,7 @@
 // Versioning -----------------------------------------------------------------
 function oda_version() {
 
-  echo "1-rc1";
+  echo "1";
 
 }