phpbb · marc1706 · Jan 20, 2026 · Nov 29, 2025 · Dec 29, 2025 · Jan 5, 2026
diff --git a/phpBB/app.php b/phpBB/app.php
@@ -11,9 +11,6 @@
 *
 */

-/**
-*/
-
 /**
 * @ignore
 */

diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml
@@ -15,6 +15,7 @@ imports:
    - { resource: services_files.yml }
    - { resource: services_filesystem.yml }
    - { resource: services_finder.yml }
+    - { resource: services_forum.yml }
    - { resource: services_help.yml }
    - { resource: services_http.yml }
    - { resource: services_language.yml }

diff --git a/phpBB/config/default/container/services_content.yml b/phpBB/config/default/container/services_content.yml
@@ -32,6 +32,7 @@ services:
            - '@config'
            - '@config_text'
            - '@dbal.conn'
+            - '@controller.helper'
            - '@user'
            - '@event_dispatcher'
            - '%core.root_path%'
@@ -43,6 +44,7 @@ services:
            - '@auth'
            - '@config'
            - '@dbal.conn'
+            - '@controller.helper'
            - '@user'
            - '%core.root_path%'
            - '%core.php_ext%'
@@ -53,6 +55,7 @@ services:
            - '@auth'
            - '@config'
            - '@dbal.conn'
+            - '@controller.helper'
            - '@user'
            - '%core.root_path%'
            - '%core.php_ext%'

diff --git a/phpBB/config/default/container/services_forum.yml b/phpBB/config/default/container/services_forum.yml
@@ -0,0 +1,27 @@
+services:
+
+    phpbb.birthday.helper:
+        class: phpbb\forum\birthday_helper
+        arguments:
+            - '@auth'
+            - '@config'
+            - '@dbal.conn'
+            - '@dispatcher'
+            - '@language'
+            - '@template'
+            - '@user'
+
+    forum.controller.index:
+        class: phpbb\forum\controller\index
+        arguments:
+            - '@auth'
+            - '@phpbb.birthday.helper'
+            - '@config'
+            - '@controller.helper'
+            - '@dispatcher'
+            - '@group_helper'
+            - '@language'
+            - '@user'
+            - '@template'
+            - '%core.root_path%'
+            - '%core.php_ext%'
diff --git a/phpBB/config/default/container/services_mention.yml b/phpBB/config/default/container/services_mention.yml
@@ -5,6 +5,7 @@ services:
        arguments:
            - '@mention.source_collection'
            - '@request'
+            - '@controller.helper'
            - '%core.root_path%'
            - '%core.php_ext%'


diff --git a/phpBB/config/default/container/services_ucp.yml b/phpBB/config/default/container/services_ucp.yml
@@ -4,6 +4,7 @@ services:
        arguments:
            - '@config'
            - '@dispatcher'
+            - '@controller.helper'
            - '@language'
            - '@request'
            - '@user'

diff --git a/phpBB/config/default/routing/routing.yml b/phpBB/config/default/routing/routing.yml
@@ -8,6 +8,10 @@
 # instantiate the 'foo_service' service and call the 'method' method.
 #

+phpbb_index_controller:
+    path: /
+    defaults: { _controller: forum.controller.index:handle }
+
 phpbb_cron_routing:
    resource: cron.yml
    prefix: /cron

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
@@ -3851,7 +3851,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
 		'U_MEMBERLIST'			=> append_sid("{$phpbb_root_path}memberlist.$phpEx"),
 		'U_VIEWONLINE'			=> $auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel') ? $controller_helper->route('phpbb_members_online') : '',
 		'U_LOGIN_LOGOUT'		=> $u_login_logout,
-		'U_INDEX'				=> append_sid("{$phpbb_root_path}index.$phpEx"),
+		'U_INDEX'				=> $controller_helper->route('phpbb_index_controller'),
 		'U_SEARCH'				=> append_sid("{$phpbb_root_path}search.$phpEx"),
 		'U_SITE_HOME'			=> $config['site_home_url'],
 		'U_REGISTER'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'),

diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php
@@ -32,6 +32,9 @@ function main($id, $mode)
 		global $config, $phpbb_root_path, $phpEx, $request;
 		global $db, $user, $auth, $phpbb_container, $phpbb_log, $phpbb_dispatcher;

+		/** @var \phpbb\controller\helper $controller_helper */
+		$controller_helper = $phpbb_container->get('controller.helper');
+
 		$user_id = $request->variable('u', 0);
 		$key = $request->variable('k', '');

@@ -49,7 +52,7 @@ function main($id, $mode)

 		if ($user_row['user_type'] <> USER_INACTIVE && !$user_row['user_newpasswd'])
 		{
-			meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx"));
+			meta_refresh(3, $controller_helper->route('phpbb_index_controller'));
 			trigger_error('ALREADY_ACTIVATED');
 		}

@@ -171,7 +174,7 @@ function main($id, $mode)
 		$vars = array('user_row', 'message');
 		extract($phpbb_dispatcher->trigger_event('core.ucp_activate_after', compact($vars)));

-		meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx"));
+		meta_refresh(3, $controller_helper->route('phpbb_index_controller'));
 		trigger_error($user->lang[$message]);
 	}
 }
diff --git a/phpBB/includes/ucp/ucp_login_link.php b/phpBB/includes/ucp/ucp_login_link.php
@@ -257,8 +257,10 @@ protected function process_login_result($result)
 	*/
 	protected function perform_redirect()
 	{
-		global $phpbb_root_path, $phpEx;
-		$url = append_sid($phpbb_root_path . 'index.' . $phpEx);
+		global $phpbb_container;
+		/** @var \phpbb\controller\helper $controller_helper */
+		$controller_helper = $phpbb_container->get('controller.helper');
+		$url = $controller_helper->route('phpbb_index_controller');
 		redirect($url);
 	}
 }
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
@@ -36,6 +36,9 @@ function main($id, $mode)
 		global $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx;
 		global $request, $phpbb_container, $phpbb_log, $phpbb_dispatcher, $language;

+		/** @var \phpbb\controller\helper $controller_helper */
+		$controller_helper = $phpbb_container->get('controller.helper');
+
 		$user->add_lang('posting');

 		$submit		= $request->variable('submit', false, false, \phpbb\request\request_interface::POST);
@@ -233,16 +236,17 @@ function main($id, $mode)
 						// Now, we can remove the user completely (kill the session) - NOT BEFORE!!!
 						if (!empty($sql_ary['user_actkey']))
 						{
-							meta_refresh(5, append_sid($phpbb_root_path . 'index.' . $phpEx));
-							$message = $user->lang[$message] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid($phpbb_root_path . 'index.' . $phpEx) . '">', '</a>');
+							$index_route = $controller_helper->route('phpbb_index_controller');
+							meta_refresh(5, $index_route);
+							$message = $language->lang($message) . '<br /><br />' . sprintf($language->lang('RETURN_INDEX'), '<a href="' . $index_route . '">', '</a>');

 							// Because the user gets deactivated we log him out too, killing his session
 							$user->session_kill();
 						}
 						else
 						{
 							meta_refresh(3, $this->u_action);
-							$message = $user->lang[$message] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+							$message = $language->lang($message) . '<br /><br />' . sprintf($language->lang('RETURN_UCP'), '<a href="' . $this->u_action . '">', '</a>');
 						}

 						trigger_error($message);
@@ -389,7 +393,7 @@ function main($id, $mode)
 						$cp->update_profile_field_data($user->data['user_id'], $cp_data);

 						meta_refresh(3, $this->u_action);
-						$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+						$message = $language->lang('PROFILE_UPDATED') . '<br /><br />' . sprintf($language->lang('RETURN_UCP'), '<a href="' . $this->u_action . '">', '</a>');
 						trigger_error($message);
 					}

@@ -563,7 +567,7 @@ function main($id, $mode)
 							WHERE user_id = ' . $user->data['user_id'];
 						$db->sql_query($sql);

-						$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+						$message = $language->lang('PROFILE_UPDATED') . '<br /><br />' . sprintf($language->lang('RETURN_UCP'), '<a href="' . $this->u_action . '">', '</a>');
 						trigger_error($message);
 					}
 				}
@@ -589,9 +593,9 @@ function main($id, $mode)
 					'S_MAGIC_URL_CHECKED' 	=> (!$enable_urls) ? ' checked="checked"' : '',

 					'BBCODE_STATUS'			=> $user->lang(($config['allow_sig_bbcode'] ? 'BBCODE_IS_ON' : 'BBCODE_IS_OFF'), '<a href="' . $controller_helper->route('phpbb_help_bbcode_controller') . '">', '</a>'),
-					'SMILIES_STATUS'		=> ($config['allow_sig_smilies']) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'],
-					'IMG_STATUS'			=> ($config['allow_sig_img']) ? $user->lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF'],
-					'URL_STATUS'			=> ($config['allow_sig_links']) ? $user->lang['URL_IS_ON'] : $user->lang['URL_IS_OFF'],
+					'SMILIES_STATUS'		=> ($config['allow_sig_smilies']) ? $language->lang('SMILIES_ARE_ON') : $language->lang('SMILIES_ARE_OFF'),
+					'IMG_STATUS'			=> ($config['allow_sig_img']) ? $language->lang('IMAGES_ARE_ON') : $language->lang('IMAGES_ARE_OFF'),
+					'URL_STATUS'			=> ($config['allow_sig_links']) ? $language->lang('URL_IS_ON') : $language->lang('URL_IS_OFF'),
 					'MAX_FONT_SIZE'			=> (int) $config['max_sig_font_size'],

 					'L_SIGNATURE_EXPLAIN'	=> $user->lang('SIGNATURE_EXPLAIN', (int) $config['max_sig_chars']),
@@ -722,7 +726,7 @@ function main($id, $mode)
 							$phpbb_avatar_manager->handle_avatar_delete($db, $user, $avatar_data, USERS_TABLE, 'user_');

 							meta_refresh(3, $this->u_action);
-							$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+							$message = $language->lang('PROFILE_UPDATED') . '<br /><br />' . sprintf($language->lang('RETURN_UCP'), '<a href="' . $this->u_action . '">', '</a>');
 							trigger_error($message);
 						}
 					}
@@ -812,7 +816,7 @@ function main($id, $mode)
 							$db->sql_query($sql);

 							meta_refresh(3, $this->u_action);
-							$message = $user->lang['AUTOLOGIN_SESSION_KEYS_DELETED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+							$message = $language->lang('AUTOLOGIN_SESSION_KEYS_DELETED') . '<br /><br />' . sprintf($language->lang('RETURN_UCP'), '<a href="' . $this->u_action . '">', '</a>');
 							trigger_error($message);
 						}
 					}
@@ -872,7 +876,7 @@ function main($id, $mode)
 		$template->assign_vars(array(
 			'ERROR'		=> (count($error)) ? implode('<br />', $error) : '',

-			'L_TITLE'	=> $user->lang['UCP_PROFILE_' . strtoupper($mode)],
+			'L_TITLE'	=> $language->lang('UCP_PROFILE_' . strtoupper($mode)),

 			'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
 			'S_UCP_ACTION'		=> $this->u_action)

diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
@@ -32,6 +32,9 @@ function main($id, $mode)
 		global $config, $db, $user, $template, $phpbb_root_path, $phpEx;
 		global $request, $phpbb_container, $phpbb_dispatcher;

+		/** @var \phpbb\controller\helper $controller_helper */
+		$controller_helper = $phpbb_container->get('controller.helper');
+
 		//
 		if ($config['require_activation'] == USER_ACTIVATION_DISABLE ||
 			(in_array($config['require_activation'], array(USER_ACTIVATION_SELF, USER_ACTIVATION_ADMIN)) && !$config['email_enable']))
@@ -558,7 +561,7 @@ function main($id, $mode)
 				);
 				extract($phpbb_dispatcher->trigger_event('core.ucp_register_register_after', compact($vars)));

-				$message = $message . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
+				$message = $message . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . $controller_helper->route('phpbb_index_controller') . '">', '</a>');
 				trigger_error($message);
 			}
 		}

diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php
@@ -32,6 +32,9 @@ function main($id, $mode)
 		global $config, $phpbb_root_path, $phpEx;
 		global $db, $user, $auth, $template, $request, $phpbb_container;

+		/** @var \phpbb\controller\helper $controller_helper */
+		$controller_helper = $phpbb_container->get('controller.helper');
+
 		$username	= $request->variable('username', '', true);
 		$email		= strtolower($request->variable('email', ''));
 		$submit		= (isset($_POST['submit'])) ? true : false;
@@ -157,10 +160,10 @@ function main($id, $mode)

 			$this->update_activation_expiration();

-			meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx"));
+			meta_refresh(3, $controller_helper->route('phpbb_index_controller'));

 			$message = ($config['require_activation'] == USER_ACTIVATION_ADMIN) ? $user->lang['ACTIVATION_EMAIL_SENT_ADMIN'] : $user->lang['ACTIVATION_EMAIL_SENT'];
-			$message .= '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
+			$message .= '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . $controller_helper->route('phpbb_index_controller') . '">', '</a>');
 			trigger_error($message);
 		}
-Original file line number
+Diff line change
@@ -11,9 +11,6 @@
     *
     */
-    /**
-    */
     /**
     * @ignore
     */
-          Expand Down