diff --git a/README.md b/README.md
index ba4ebf0..e495506 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# phpBB 3.2 & 3.3 Extension - phpBB.de Terms of Use
+# phpBB 3.3 Extension - phpBB.de Terms of Use
## Installation
@@ -18,7 +18,7 @@ Go to "ACP" > "Customise" > "Extensions" and enable the "Terms of Use" extension
This extension adds one administrator permission. The permission can be found at "Administrative
permissions" in the tab 'Misc' > 'Can manage “Terms of Use“'. The role "Full Admin" gets it
-automatically on install or update to v1.1.0.
+automatically on installation.
## Development
diff --git a/adm/style/acp_tou_ppsetup.html b/adm/style/acp_tou_ppsetup.html
index dea392f..aa0be3f 100644
--- a/adm/style/acp_tou_ppsetup.html
+++ b/adm/style/acp_tou_ppsetup.html
@@ -1,15 +1,11 @@
{% include 'overall_header.html' %}
@@ -26,8 +22,8 @@
{{ lang('ACP_TOU_PPSETUP_TITLE') }}
{{ lang('ACP_TOU_PPSETUP_USE_CUSTOM')}}{{ lang('COLON') }} {{ lang('ACP_TOU_PPSETUP_USE_CUSTOM_EXPLAIN')}}
- {{ lang('YES') }}
- {{ lang('NO') }}
+ {{ lang('YES') }}
+ {{ lang('NO') }}
@@ -56,13 +52,13 @@ {{ lang('ACP_TOU_PPSETUP_TITLE') }}
{% if S_BBCODE_ALLOWED %}
- {{ lang('DISABLE_BBCODE') }}
+ {{ lang('DISABLE_BBCODE') }}
{% endif %}
{% if S_SMILIES_ALLOWED %}
- {{ lang('DISABLE_SMILIES') }}
+ {{ lang('DISABLE_SMILIES') }}
{% endif %}
{% if S_LINKS_ALLOWED %}
- {{ lang('DISABLE_MAGIC_URL') }}
+ {{ lang('DISABLE_MAGIC_URL') }}
{% endif %}
{{ lang('OPTIONS') }}{{ lang('COLON') }} {{ BBCODE_STATUS }} :: {{ IMG_STATUS }} :: {{ FLASH_STATUS }} :: {{ URL_STATUS }} :: {{ SMILIES_STATUS }}
@@ -70,8 +66,8 @@ {{ lang('ACP_TOU_PPSETUP_TITLE') }}
-
-
+
+
{{ S_FORM_TOKEN }}
diff --git a/adm/style/acp_tou_settings.html b/adm/style/acp_tou_settings.html
index d0e288c..fe21c64 100644
--- a/adm/style/acp_tou_settings.html
+++ b/adm/style/acp_tou_settings.html
@@ -19,23 +19,23 @@ {{ lang('ACP_TOU_SETTINGS_TITLE') }}
{{ lang('ACP_TOU_TOUSETUP_USE_CUSTOM')}}{{ lang('COLON') }} {{ lang('ACP_TOU_TOUSETUP_USE_CUSTOM_EXPLAIN')}}
- {{ lang('YES') }}
- {{ lang('NO') }}
+ {{ lang('YES') }}
+ {{ lang('NO') }}
{{ lang('ACP_TOU_PPSETUP_USE_CUSTOM')}}{{ lang('COLON') }} {{ lang('ACP_TOU_PPSETUP_USE_CUSTOM_EXPLAIN')}}
- {{ lang('YES') }}
- {{ lang('NO') }}
+ {{ lang('YES') }}
+ {{ lang('NO') }}
-
+
{{ S_FORM_TOKEN }}
diff --git a/adm/style/acp_tou_tousetup.html b/adm/style/acp_tou_tousetup.html
index 3232643..e98b40d 100644
--- a/adm/style/acp_tou_tousetup.html
+++ b/adm/style/acp_tou_tousetup.html
@@ -1,15 +1,11 @@
{% include 'overall_header.html' %}
@@ -26,8 +22,8 @@ {{ lang('ACP_TOU_TOUSETUP_TITLE') }}
{{ lang('ACP_TOU_TOUSETUP_USE_CUSTOM')}}{{ lang('COLON') }} {{ lang('ACP_TOU_TOUSETUP_USE_CUSTOM_EXPLAIN')}}
- {{ lang('YES') }}
- {{ lang('NO') }}
+ {{ lang('YES') }}
+ {{ lang('NO') }}
@@ -56,13 +52,13 @@ {{ lang('ACP_TOU_TOUSETUP_TITLE') }}
{% if S_BBCODE_ALLOWED %}
- {{ lang('DISABLE_BBCODE') }}
+ {{ lang('DISABLE_BBCODE') }}
{% endif %}
{% if S_SMILIES_ALLOWED %}
- {{ lang('DISABLE_SMILIES') }}
+ {{ lang('DISABLE_SMILIES') }}
{% endif %}
{% if S_LINKS_ALLOWED %}
- {{ lang('DISABLE_MAGIC_URL') }}
+ {{ lang('DISABLE_MAGIC_URL') }}
{% endif %}
{{ lang('OPTIONS') }}{{ lang('COLON') }} {{ BBCODE_STATUS }} :: {{ IMG_STATUS }} :: {{ FLASH_STATUS }} :: {{ URL_STATUS }} :: {{ SMILIES_STATUS }}
@@ -70,8 +66,8 @@ {{ lang('ACP_TOU_TOUSETUP_TITLE') }}
-
-
+
+
{{ S_FORM_TOKEN }}
diff --git a/composer.json b/composer.json
index 85a115d..9dc6d23 100644
--- a/composer.json
+++ b/composer.json
@@ -3,8 +3,8 @@
"type" : "phpbb-extension",
"description" : "Forces the user to confirm the terms of use.",
"homepage" : "https://github.com/phpbb-de/phpbb-ext-tou",
- "version" : "1.1.5",
- "time" : "2020-11-25",
+ "version" : "1.1.6",
+ "time" : "2024-06-23",
"license" : "GPL-2.0-only",
"authors" : [
{
@@ -21,7 +21,7 @@
}
],
"require" : {
- "php" : ">=5.4.7"
+ "php" : ">=7.2.0"
},
"require-dev" : {
"phing/phing": "2.4.*"
@@ -29,7 +29,7 @@
"extra" : {
"display-name" : "Terms of use",
"soft-require" : {
- "phpbb/phpbb": ">=3.2.4,<4.0.0@dev"
+ "phpbb/phpbb": ">=3.3.0,<4.0.0@dev"
}
},
"support" : {
diff --git a/controller/main.php b/controller/main.php
index cc8372f..33f7b98 100644
--- a/controller/main.php
+++ b/controller/main.php
@@ -119,7 +119,7 @@ public function handle()
$redirect = reapply_sid($redirect);
meta_refresh(3, $redirect);
- trigger_error($message . ' ' . sprintf($l_redirect, '', ' '));
+ trigger_error($message . ' ' . sprintf($l_redirect, '', ' '));
}
trigger_error('INVALID_FORM');
}
diff --git a/event/main.php b/event/main.php
index 86774ac..3c25fbc 100644
--- a/event/main.php
+++ b/event/main.php
@@ -19,7 +19,7 @@
*/
class main implements EventSubscriberInterface
{
- static public function getSubscribedEvents()
+ public static function getSubscribedEvents()
{
return array(
'core.page_header' => 'page_header',
diff --git a/event/permission_listener.php b/event/permission_listener.php
index 6028638..2f8aecc 100644
--- a/event/permission_listener.php
+++ b/event/permission_listener.php
@@ -32,7 +32,7 @@ public function __construct(\phpbb\auth\auth $auth)
$this->auth = $auth;
}
- static public function getSubscribedEvents()
+ public static function getSubscribedEvents()
{
return array(
'core.permissions' => 'permissions',
diff --git a/migrations/v110.php b/migrations/v110.php
index fc738ea..fc1bb02 100644
--- a/migrations/v110.php
+++ b/migrations/v110.php
@@ -12,7 +12,7 @@
class v110 extends \phpbb\db\migration\migration
{
- static public function depends_on()
+ public static function depends_on()
{
return array(
'\phpbbde\tou\migrations\v_1_0_0',
diff --git a/migrations/v111.php b/migrations/v111.php
index c01c94a..b11de76 100644
--- a/migrations/v111.php
+++ b/migrations/v111.php
@@ -12,7 +12,7 @@
class v111 extends \phpbb\db\migration\migration
{
- static public function depends_on()
+ public static function depends_on()
{
return array(
'\phpbbde\tou\migrations\v110',
diff --git a/migrations/v112.php b/migrations/v112.php
index fdbade6..07fc7f2 100644
--- a/migrations/v112.php
+++ b/migrations/v112.php
@@ -12,7 +12,7 @@
class v112 extends \phpbb\db\migration\migration
{
- static public function depends_on()
+ public static function depends_on()
{
return array(
'\phpbbde\tou\migrations\v111',
diff --git a/migrations/v113.php b/migrations/v113.php
index ced33e3..beeeab8 100644
--- a/migrations/v113.php
+++ b/migrations/v113.php
@@ -12,7 +12,7 @@
class v113 extends \phpbb\db\migration\migration
{
- static public function depends_on()
+ public static function depends_on()
{
return array(
'\phpbbde\tou\migrations\v112',
diff --git a/migrations/v114.php b/migrations/v114.php
index 26aee43..94586c8 100644
--- a/migrations/v114.php
+++ b/migrations/v114.php
@@ -12,7 +12,7 @@
class v114 extends \phpbb\db\migration\migration
{
- static public function depends_on()
+ public static function depends_on()
{
return array(
'\phpbbde\tou\migrations\v113',
diff --git a/migrations/v115.php b/migrations/v115.php
index ac1c080..a6818c3 100644
--- a/migrations/v115.php
+++ b/migrations/v115.php
@@ -12,7 +12,7 @@
class v115 extends \phpbb\db\migration\migration
{
- static public function depends_on()
+ public static function depends_on()
{
return array(
'\phpbbde\tou\migrations\v114',
diff --git a/migrations/v_1_0_0.php b/migrations/v_1_0_0.php
index d640825..f49039a 100644
--- a/migrations/v_1_0_0.php
+++ b/migrations/v_1_0_0.php
@@ -12,7 +12,7 @@
class v_1_0_0 extends \phpbb\db\migration\migration
{
- static public function depends_on()
+ public static function depends_on()
{
return array(
'\phpbb\db\migration\data\v31x\v311',
diff --git a/styles/prosilver/template/tou_body.html b/styles/prosilver/template/tou_body.html
index 05e1df3..ce654ed 100644
--- a/styles/prosilver/template/tou_body.html
+++ b/styles/prosilver/template/tou_body.html
@@ -17,8 +17,8 @@ {{ lang('PRIVACY') }}
{% if not HAS_ALREADY_AGREED and S_REGISTERED_USER %}
-
-
+
+
{% endif %}
{{ S_FORM_TOKEN }}