Modernize extension; merge and reconcile PRs #5, #6, #7

.gitattributes

@@ -1,11 +1,8 @@
 .gitattributes export-ignore
 .gitignore export-ignore
-.travis.yml export-ignore
+.github export-ignore
 README.md export-ignore
-composer.lock export-ignore
-composer.phar export-ignore
-phpunit.xml.dist export-ignore
-/travis export-ignore
+docs export-ignore
 
 # Auto detect text files and perform LF normalization
 * text=auto

.github/workflows/ci.yml

@@ -0,0 +1,33 @@
+name: CI
+
+on:
+    push:
+        branches: [master]
+    pull_request:
+        branches: [master]
+
+permissions:
+    contents: read
+
+jobs:
+    lint:
+        name: PHP ${{ matrix.php }} lint
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                php: ['7.1', '7.4', '8.0', '8.1']
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Set up PHP ${{ matrix.php }}
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php }}
+                  coverage: none
+                  tools: composer:v2
+
+            - name: PHP syntax check
+              run: find . -name '*.php' -not -path './.git/*' -print0 | xargs -0 -n1 php -l
+
+            - name: Validate composer.json
+              run: composer validate --no-check-all --no-check-publish

README.md

@@ -1,13 +1,20 @@
 Holiday Flare
 =================
-Allows an admin to display various seasonal holiday flares to their default style. The images/javascript can be enable/disabled in the ACP via `EXTENSIONS --> Holiday Flare --> Settings`.
+Allows an admin to display seasonal holiday flares on their forum. The Christmas and Valentine's Day themes can be enabled or disabled independently in the ACP via `EXTENSIONS --> Holiday Flare --> Settings`.
 
-[![Build Status](https://travis-ci.org/phpbbmodders/holiday_flare.png)](https://travis-ci.org/phpbbmodders/holiday_flare)
+[![CI](https://github.com/phpbbmodders/holiday_flare/actions/workflows/ci.yml/badge.svg)](https://github.com/phpbbmodders/holiday_flare/actions/workflows/ci.yml)
 
 ## Features
-* enable/disable the various holiday flares
- * Add Santa Hat to the corner of the header
+* Enable/disable each holiday flare independently
+ * Christmas: a Santa hat in the header corner, plus a smaller matching icon on the forum list (prosilver, Green-Style-Slim, pro_ubuntu_lucid, proflat)
+ * Valentine's Day: a matching header-corner icon (prosilver, Green-Style-Slim, pro_ubuntu_lucid, proflat)
 
+See [docs/screenshots](docs/screenshots) for both themes rendered.
+
+## Requirements
+
+* PHP 7.1 or later
+* phpBB 3.1.0-RC3 up to (but not including) 3.3
 
 ## Installation
 
@@ -24,8 +31,25 @@ Go to ACP -> `CUSTOMISE -> Manage extensions ->` enable Holiday Flare
 
 ### 3. configure
 
-Go to ACP -> `EXTENSIONS --> Holiday Flare --> Settings ->` set *Enable Santa Hat* to *Yes*
+Go to ACP -> `EXTENSIONS --> Holiday Flare --> Settings ->` set *Christmas Theme* and/or *Valentine Theme* to *Yes*
 
 ## Support
 
-https://www.phpbb.com/community/viewtopic.php?f=456&t=2277491
+- **Bug reports**: [Open an issue](https://github.com/phpbbmodders/holiday_flare/issues).
+- **Everything else** (questions, feature requests, general discussion): [the phpBB.com support thread](https://www.phpbb.com/community/viewtopic.php?f=456&t=2277491).
+
+## Contributing
+
+Contributions are welcome! Pull requests are welcome for bug fixes or discussed features.
+
+## Acknowledgments
+
+- The Valentine's Day theme was originally contributed by [TWEagle](https://github.com/TWEagle).
+- The jQuery-based header banner was originally contributed by Rich McGirr ([rmcgirr83](https://github.com/rmcgirr83)), extended to additional styles by Raphaël M. ([Galixte](https://github.com/Galixte)).
+- Modernization (current PHP/phpBB version support, a real bug fix confirmed against a live phpBB install, reconciling several long-open pull requests, and this documentation) assisted by [Claude](https://www.anthropic.com/claude).
+
+## License
+
+This extension is licensed under the **GNU General Public License v2.0**.
+
+See [license.txt](license.txt) for more information.

acp/holidayflare_info.php

@@ -1,10 +1,12 @@
 <?php
 /**
  *
- * @package Holiday Flare extension
+ * Holiday Flare extension for the phpBB Forum Software package
+ *
  * @author bonelifer (William Jacoby) bonelifer@phpbbmodders.net
  * @author VSE (Matt Friedman)
  * @copyright (c) 2014 phpbbmodders.net
+ * @copyright (c) 2026, phpBB Modders, https://www.phpbbmodders.com/
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */

acp/holidayflare_module.php

@@ -1,10 +1,12 @@
 <?php
 /**
  *
- * @package Holiday Flare extension
+ * Holiday Flare extension for the phpBB Forum Software package
+ *
  * @author bonelifer (William Jacoby) bonelifer@phpbbmodders.net
  * @author VSE (Matt Friedman)
  * @copyright (c) 2014 phpbbmodders.net
+ * @copyright (c) 2026, phpBB Modders, https://www.phpbbmodders.com/
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
@@ -56,14 +58,15 @@ public function main($id, $mode)
 				trigger_error($user->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING);
 			}
 
-			$enable_hohohatcorner = $this->request->variable('enable_hohohatcorner', 0);
-			$this->config->set('enable_hohohatcorner', $enable_hohohatcorner);
+			$this->config->set('enable_xmas', $this->request->variable('enable_xmas', 0));
+			$this->config->set('enable_valentine', $this->request->variable('enable_valentine', 0));
 
 			trigger_error($this->user->lang('CONFIG_UPDATED') . adm_back_link($this->u_action));
 		}
 
 		$this->template->assign_vars(array(
-			'S_ENABLE_HOHOHATCORNER'	=> isset($this->config['enable_hohohatcorner']) ? $this->config['enable_hohohatcorner'] : '',
+			'S_ENABLE_XMAS'			=> isset($this->config['enable_xmas']) ? $this->config['enable_xmas'] : '',
+			'S_ENABLE_VALENTINE'		=> isset($this->config['enable_valentine']) ? $this->config['enable_valentine'] : '',
 
 			'U_ACTION'					=> $this->u_action,
 		));

adm/style/acp_holidayflare.html

@@ -9,10 +9,17 @@ <h1>{L_ACP_HOLIDAYFLARE}</h1>
 	<fieldset>
 		<legend>{L_ACP_HOLIDAYFLARE_SETTINGS}</legend>
 		<dl>
-			<dt><label for="enable_hohohatcorner">{L_ENABLE_HOHOHATCORNER}{L_COLON}</label><br /><span>{L_ENABLE_HOHOHATCORNER_EXPLAIN}</span></dt>
+			<dt><label for="enable_xmas">{L_ENABLE_XMAS}{L_COLON}</label><br /><span>{L_ENABLE_XMAS_EXPLAIN}</span></dt>
 			<dd>
-				<label><input type="radio" class="radio" name="enable_hohohatcorner" id="enable_hohohatcorner" value="1"<!-- IF S_ENABLE_HOHOHATCORNER --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_hohohatcorner" value="0"<!-- IF not S_ENABLE_HOHOHATCORNER --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+				<label><input type="radio" class="radio" name="enable_xmas" id="enable_xmas" value="1"<!-- IF S_ENABLE_XMAS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_xmas" value="0"<!-- IF not S_ENABLE_XMAS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+			</dd>
+		</dl>
+		<dl>
+			<dt><label for="enable_valentine">{L_ENABLE_VALENTINE}{L_COLON}</label><br /><span>{L_ENABLE_VALENTINE_EXPLAIN}</span></dt>
+			<dd>
+				<label><input type="radio" class="radio" name="enable_valentine" id="enable_valentine" value="1"<!-- IF S_ENABLE_VALENTINE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_valentine" value="0"<!-- IF not S_ENABLE_VALENTINE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 			</dd>
 		</dl>
 	</fieldset>

composer.json

@@ -2,29 +2,48 @@
 	"name": "phpbbmodders/holidayflare",
 	"type": "phpbb-extension",
 	"description": "Allows an admin to display various seasonal holiday flares to their default style. The images/javascript can be enable/disabled in the ACP via EXTENSIONS --> Holiday Flare --> Settings",
-	"version": "2.0.0",
-	"license": "GPL-2.0",
+	"homepage": "https://www.phpbbmodders.com/",
+	"version": "2.1.0",
+	"keywords": [
+		"phpbb",
+		"extension",
+		"holidays",
+		"seasonal",
+		"decorations"
+	],
+	"license": "GPL-2.0-only",
 	"authors": [
+		{
+			"name": "phpBB Modders",
+			"email": "board@phpbbmodders.com",
+			"homepage": "https://www.phpbbmodders.com/",
+			"role": "Extension Developer"
+		},
 		{
 			"name": "William (bonelifer)",
-			"role": "Developer"
+			"email": "bonelifer@phpbbmodders.net",
+			"homepage": "https://www.phpbbmodders.com/",
+			"role": "Past Developer"
 		},
 		{
-			"name": "Matt (VSE)",
-			"role": "Extension conversion"
+			"name": "Matt Friedman (MattF)",
+			"homepage": "https://www.phpbb.com/customise/db/author/mattf",
+			"role": "Past Developer"
 		}
 	],
 	"require": {
-		"php": ">=5.3.3",
-		"composer/installers": "~1.0"
+		"php": ">=7.1",
+		"composer/installers": "^1.0"
 	},
-   "require-dev": {
-      "phpbb/epv": "dev-master"
-   },
 	"extra": {
 		"display-name": "Holiday Flare",
 		"soft-require": {
-			"phpbb/phpbb": ">=3.1.0-RC3,<3.2.*@dev"
+			"phpbb/phpbb": ">=3.1.0-RC3,<3.3.*@dev"
+		},
+		"version-check": {
+			"host": "www.phpbb.com",
+			"directory": "/customise/db/extension/holiday_flare",
+			"filename": "version_check"
 		}
 	}
 }