Refactor code

Signed-off-by: Bugo <[email protected]>

Author: dragomano

Sources/Theme.php

@@ -536,7 +536,7 @@ public static function loadSubTemplate(string|array $sub_template_name, bool|str
 			}
 		}
 
-		if (! $template_loaded) {
+		if (!$template_loaded) {
 			$theme_function = 'template_' . $template_name;
 
 			$callable = Utils::getCallable($theme_function);
@@ -548,7 +548,7 @@ public static function loadSubTemplate(string|array $sub_template_name, bool|str
 			}
 		}
 
-		if (! $template_loaded) {
+		if (!$template_loaded) {
 			// Handle errors based on the $fatal parameter.
 			if ($fatal === false) {
 				ErrorHandler::fatalLang(

Sources/Utils.php

@@ -2477,6 +2477,28 @@ public static function getCallable(string|callable $input, ?bool $ignore_errors
 		return $callable;
 	}
 
+	/**
+	 * Universal template callback invoker following the logic of the "first file".
+	 *
+	 * @param string $name   Callback name (without prefix)
+	 * @param string $prefix Function name prefix (e.g. 'template_callback_' or 'template_profile_')
+	 * @return mixed Result of the callback execution or null if not found
+	 */
+	public static function callTemplateCallback(string $name, string $prefix = 'template_callback_'): mixed
+	{
+		if (function_exists($prefix . $name)) {
+			$name = $prefix . $name;
+		}
+
+		$callable = Utils::getCallable($name);
+
+		if ($callable) {
+			return call_user_func($callable);
+		}
+
+		return null;
+	}
+
 	/*************************
 	 * Internal static methods
 	 *************************/

Themes/default/Admin.template.php

@@ -872,13 +872,7 @@ function ($v)
 		// Hang about? Are you pulling my leg - a callback?!
 		if (is_array($config_var) && $config_var['type'] == 'callback')
 		{
-			$callbackName = $config_var['name'];
-			if (function_exists('template_callback_' . $callbackName)) {
-				$callbackName = 'template_callback_' . $callbackName;
-			}
-
-			$callable = Utils::getCallable($callbackName);
-			$callable && call_user_func($callable);
+			Utils::callTemplateCallback($config_var['name']);
 
 			continue;
 		}

Themes/default/Profile.template.php

@@ -1505,10 +1505,8 @@ function template_edit_options()
 
 		elseif ($field['type'] == 'callback')
 		{
-			if (isset($field['callback_func']) && function_exists('template_profile_' . $field['callback_func']))
-			{
-				$callback_func = 'template_profile_' . $field['callback_func'];
-				$callback_func();
+			if (!empty($field['callback_func'])) {
+				Utils::callTemplateCallback($field['callback_func'], 'template_profile_');
 			}
 		}
 		else

Themes/default/Register.template.php

@@ -198,10 +198,8 @@ function verifyAgree()
 		{
 			if ($field['type'] == 'callback')
 			{
-				if (isset($field['callback_func']) && function_exists('template_profile_' . $field['callback_func']))
-				{
-					$callback_func = 'template_profile_' . $field['callback_func'];
-					$callback_func();
+				if (!empty($field['callback_func'])) {
+					Utils::callTemplateCallback($field['callback_func'], 'template_profile_');
 				}
 			}
 			else