From 2c7da66570999dcd21f11f976dc6ec27d820f45c Mon Sep 17 00:00:00 2001
From: Dan Fandrich <danf@mageia.org>
Date: Fri, 4 Oct 2024 19:28:06 -0700
Subject: Use @ when accessing variables in templates

Access without the @ symbol is the older method and is discouraged.
---
 modules/phpbb/templates/config.php           | 8 ++++----
 modules/phpbb/templates/forums_redirect.conf | 4 ++--
 modules/phpbb/templates/forums_vhost.conf    | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'modules/phpbb')

diff --git a/modules/phpbb/templates/config.php b/modules/phpbb/templates/config.php
index 5d878235..a713adda 100644
--- a/modules/phpbb/templates/config.php
+++ b/modules/phpbb/templates/config.php
@@ -2,11 +2,11 @@
 // phpBB 3.0.x auto-generated configuration file
 // // Do not change anything in this file!
 $dbms = 'postgres';
-$dbhost = 'pg.<%= domain %>';
+$dbhost = 'pg.<%= @domain %>';
 $dbport = '';
-$dbname = '<%= database %>';
-$dbuser = '<%= user %>';
-$dbpasswd = '<%= pgsql_password %>';
+$dbname = '<%= @database %>';
+$dbuser = '<%= @user %>';
+$dbpasswd = '<%= @pgsql_password %>';
 $table_prefix = 'phpbb_';
 $acm_type = 'apc';
 $load_extensions = '';
diff --git a/modules/phpbb/templates/forums_redirect.conf b/modules/phpbb/templates/forums_redirect.conf
index 24747b4c..0dcfec53 100644
--- a/modules/phpbb/templates/forums_redirect.conf
+++ b/modules/phpbb/templates/forums_redirect.conf
@@ -1,2 +1,2 @@
-Redirect /<%= lang %> <%= url %>
-Redirect /<%= lang %>/ <%= url %>
+Redirect /<%= @lang %> <%= @url %>
+Redirect /<%= @lang %>/ <%= @url %>
diff --git a/modules/phpbb/templates/forums_vhost.conf b/modules/phpbb/templates/forums_vhost.conf
index d60e65ab..ea0963dd 100644
--- a/modules/phpbb/templates/forums_vhost.conf
+++ b/modules/phpbb/templates/forums_vhost.conf
@@ -13,9 +13,9 @@
     RewriteRule ^/$ /en/ [R]
     RewriteRule ^/(..)$ /$1/ [R]
 
-    AliasMatch ^/(..)/(.*) <%= forums_dir %>/$1/phpBB/$2
+    AliasMatch ^/(..)/(.*) <%= @forums_dir %>/$1/phpBB/$2
 
-    <Directory ~ "<%= forums_dir %>/.*/phpBB/">
+    <Directory ~ "<%= @forums_dir %>/.*/phpBB/">
     <IfModule mod_authz_core.c>
         # Apache 2.4
         Require all granted
@@ -45,7 +45,7 @@ forbidden = ['install',
 ]
 for f in forbidden
 -%>
-    <Directory <%= forums_dir %>/.*/phpBB/<%= f %>/ >
+    <Directory <%= @forums_dir %>/.*/phpBB/<%= @f %>/ >
     <IfModule mod_authz_core.c>
         # Apache 2.4
         Require all denied
-- 
cgit v1.2.1